From b33f458b83ac57132cc8adbef2d2f76a64367626 Mon Sep 17 00:00:00 2001 From: Jan Holthuis Date: Thu, 5 Nov 2020 12:27:21 +0100 Subject: [PATCH] CueControl: Fix previewing regression from PR #2194 --- src/engine/controls/cuecontrol.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/engine/controls/cuecontrol.cpp b/src/engine/controls/cuecontrol.cpp index ecb217b2fb29..633cbca79032 100644 --- a/src/engine/controls/cuecontrol.cpp +++ b/src/engine/controls/cuecontrol.cpp @@ -1076,13 +1076,13 @@ void CueControl::hotcueActivatePreview(HotcueControl* pControl, double value) { // hotcue. If this hotcue is previewing: mixxx::CueType cueType = pControl->getPreviewingType(); if (cueType != mixxx::CueType::Invalid) { - // Mark this hotcue as not previewing. - double position = pControl->getPreviewingPosition(); - pControl->setPreviewingType(mixxx::CueType::Invalid); - pControl->setPreviewingPosition(Cue::kNoPosition); - // If this is the last hotcue to leave preview. if (--m_iCurrentlyPreviewingHotcues == 0 && !m_bPreviewing) { + // Mark this hotcue as not previewing. + double position = pControl->getPreviewingPosition(); + pControl->setPreviewingType(mixxx::CueType::Invalid); + pControl->setPreviewingPosition(Cue::kNoPosition); + m_pPlay->set(0.0); // Need to unlock before emitting any signals to prevent deadlock. lock.unlock();