Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

CueControl: Fix previewing regression from PR #2194 #3267

Merged
merged 1 commit into from
Nov 5, 2020
Merged

CueControl: Fix previewing regression from PR #2194 #3267

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/engine/controls/cuecontrol.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down