Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/2.3' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
daschuer committed Jan 11, 2021
2 parents 4ae5b1a + 6727e5e commit 5cc093d
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/engine/controls/cuecontrol.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1253,14 +1253,13 @@ void CueControl::cueCDJ(double value) {
} else if (freely_playing || trackAt == TrackAt::End) {
// Jump to cue when playing or when at end position
m_pPlay->set(0.0);
// Need to unlock before emitting any signals to prvent deadlock.
seekAbs(m_pCuePoint->get());
} else if (trackAt == TrackAt::Cue) {
// pause at cue point
// paused at cue point
updateCurrentlyPreviewingIndex(kMainCueIndex);
m_pPlay->set(1.0);
} else {
// Pause not at cue point and not at end position
// Paused not at cue point and not at end position
cueSet(value);

// If quantize is enabled, jump to the cue point since it's not
Expand Down Expand Up @@ -1309,6 +1308,7 @@ void CueControl::cueDenon(double value) {
updateCurrentlyPreviewingIndex(kMainCueIndex);
m_pPlay->set(1.0);
} else {
m_pPlay->set(0.0);
seekExact(m_pCuePoint->get());
}
} else if (m_currentlyPreviewingIndex == kMainCueIndex) {
Expand Down

0 comments on commit 5cc093d

Please sign in to comment.