Merge branch '2.2' of git@github.com:mixxxdj/mixxx.git into 2.3

# Conflicts:
#	src/engine/cuecontrol.cpp
#	src/engine/cuecontrol.h

2 files changed, 4 insertions, 5 deletions

diff --git a/src/engine/controls/cuecontrol.cpp b/src/engine/controls/cuecontrol.cpp
index 5baba76efe..c599daa8c1 100644
--- a/src/engine/controls/cuecontrol.cpp
+++ b/src/engine/controls/cuecontrol.cpp
@@ -1523,14 +1523,13 @@ void CueControl::outroEndActivate(double value) {
     }
 }
 
-bool CueControl::updateIndicatorsAndModifyPlay(bool newPlay, bool playPossible) {
+bool CueControl::updateIndicatorsAndModifyPlay(bool newPlay, bool oldPlay, bool playPossible) {
     //qDebug() << "updateIndicatorsAndModifyPlay" << newPlay << playPossible
     //        << m_iCurrentlyPreviewingHotcues << m_bPreviewing;
     QMutexLocker lock(&m_mutex);
     CueMode cueMode = static_cast<CueMode>(static_cast<int>(m_pCueMode->get()));
     if ((cueMode == CueMode::Denon || cueMode == CueMode::Numark) &&
-            newPlay && playPossible &&
-            !m_pPlay->toBool() &&
+            newPlay && !oldPlay && playPossible &&
             !m_bypassCueSetByPlay) {
         // in Denon mode each play from pause moves the cue point
         // if not previewing
@@ -1542,7 +1541,7 @@ bool CueControl::updateIndicatorsAndModifyPlay(bool newPlay, bool playPossible)
     // (play = 0.0) is used for latching play.
     bool previewing = false;
     if (m_bPreviewing || m_iCurrentlyPreviewingHotcues) {
-        if (!newPlay) {
+        if (!newPlay && oldPlay) {
             // play latch request: stop previewing and go into normal play mode.
             m_bPreviewing = false;
             m_iCurrentlyPreviewingHotcues = 0;
diff --git a/src/engine/controls/cuecontrol.h b/src/engine/controls/cuecontrol.h
index 6df689e4d0..ee17926cf3 100644
--- a/src/engine/controls/cuecontrol.h
+++ b/src/engine/controls/cuecontrol.h
@@ -125,7 +125,7 @@ class CueControl : public EngineControl {
     ~CueControl() override;
 
     void hintReader(HintVector* pHintList) override;
-    bool updateIndicatorsAndModifyPlay(bool newPlay, bool playPossible);
+    bool updateIndicatorsAndModifyPlay(bool newPlay, bool oldPlay, bool playPossible);
     void updateIndicators();
     bool isTrackAtIntroCue();
     void resetIndicators();