Merge remote-tracking branch 'upstream/master' into rate_ratio

Conflicts:
	src/engine/sync/synccontrol.cpp

1 files changed, 2 insertions, 2 deletions

diff --git a/src/vinylcontrol/vinylcontrolxwax.cpp b/src/vinylcontrol/vinylcontrolxwax.cpp
index 3aa0e9cf96..0904f64dc8 100644
--- a/src/vinylcontrol/vinylcontrolxwax.cpp
+++ b/src/vinylcontrol/vinylcontrolxwax.cpp
@@ -136,8 +136,8 @@ VinylControlXwax::VinylControlXwax(UserSettingsPointer pConfig, QString group)
         speed = 1.35;
     }
 
-    double latency = ControlObject::getControl(
-            ConfigKey("[Master]", "latency"))->get();
+    double latency = ControlObject::get(
+            ConfigKey("[Master]", "latency"));
     if (latency <= 0 || latency > 200) {
         qDebug() << "Failed to get sane latency, assuming 20 as a reasonable value";
         latency = 20;