fixed issue with SLIP + Jog Wheel

1 files changed, 7 insertions, 5 deletions

diff --git a/res/controllers/Denon-MC7000-scripts.js b/res/controllers/Denon-MC7000-scripts.js
index bdeceeb3af..819e76b8a6 100644
--- a/res/controllers/Denon-MC7000-scripts.js
+++ b/res/controllers/Denon-MC7000-scripts.js
@@ -654,19 +654,21 @@ MC7000.wheelTouch = function(channel, control, value, status, group) {
     var deckNumber = script.deckFromGroup(group);
     var deckOffset = deckNumber - 1;
     var maxLibrary = engine.getValue("[Master]", "maximize_library");
-    if (MC7000.isVinylMode[deckOffset]) {
-        if (value === 0x7F && maxLibrary === 0) {
+    if (MC7000.isVinylMode[deckOffset] && maxLibrary === 0) {
+        if (value === 0x7F) {
             engine.scratchEnable(deckNumber, MC7000.jogWheelTicksPerRevolution,
                 MC7000.scratchParams.recordSpeed,
                 MC7000.scratchParams.alpha,
                 MC7000.scratchParams.beta);
         } else {
-            engine.scratchDisable(deckNumber);
             if (engine.getValue(group, "slip_enabled")) {
+                engine.scratchDisable(deckNumber, false); // stops scratching immediately
                 engine.setValue(group, "slip_enabled", false);
                 engine.beginTimer(50, function() {
                     engine.setValue(group, "slip_enabled", true);
                 }, true);
+            } else {
+                engine.scratchDisable(deckNumber); // continues scratching e.g. for backspin
             }
         }
     }
@@ -684,9 +686,9 @@ MC7000.wheelTurn = function(channel, control, value, status, group) {
     var deckOffset = deckNumber - 1;
     var maxLibrary = engine.getValue("[Master]", "maximize_library");
     if (maxLibrary === 1 && numTicks > 0) {
-        engine.setValue("[Library]", "MoveUp", 1);
-    } else if (maxLibrary === 1 && numTicks < 0) {
         engine.setValue("[Library]", "MoveDown", 1);
+    } else if (maxLibrary === 1 && numTicks < 0) {
+        engine.setValue("[Library]", "MoveUp", 1);
     } else if (engine.isScratching(deckNumber)) {
     // Scratch!
         engine.scratchTick(deckNumber, numTicks * MC7000.jogSensitivity);