diff options
| author | Uwe Klotz <uklotz@mixxx.org> | 2020-10-29 09:41:18 +0100 |
|---|---|---|
| committer | Uwe Klotz <uklotz@mixxx.org> | 2020-10-29 09:41:18 +0100 |
| commit | 4076066ce132f20be455b431ca41639133e2485c (patch) | |
| tree | 31e82e042df7732e5e46fdbb5fcf00d8fa5b6eed /src/mixer/playermanager.cpp | |
| parent | 7a0d54eb0a67607ac3e45aec627a13b5f3fc1a37 (diff) | |
| parent | c115a0c67c30556d52da1284d8f1df7335f5b3c2 (diff) | |
Merge branch '2.3' of git@github.com:mixxxdj/mixxx.git into main
# Conflicts:
# src/engine/enginebuffer.cpp
# src/engine/sync/synccontrol.cpp
Diffstat (limited to 'src/mixer/playermanager.cpp')
| -rw-r--r-- | src/mixer/playermanager.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mixer/playermanager.cpp b/src/mixer/playermanager.cpp index 0f2b5b2938..f2d657ec97 100644 --- a/src/mixer/playermanager.cpp +++ b/src/mixer/playermanager.cpp @@ -633,7 +633,8 @@ void PlayerManager::slotLoadTrackToPlayer(TrackPointer pTrack, QString group, bo if (!m_pAutoDjEnabled) { m_pAutoDjEnabled = make_parented<ControlProxy>("[AutoDJ]", "enabled", this); } - bool autoDjSkipClone = m_pAutoDjEnabled->get() && (pPlayer == m_decks.at(0) || pPlayer == m_decks.at(1)); + bool autoDjSkipClone = m_pAutoDjEnabled->toBool() && + (pPlayer == m_decks.at(0) || pPlayer == m_decks.at(1)); if (cloneOnDoubleTap && m_lastLoadedPlayer == group && elapsed < mixxx::Duration::fromSeconds(0.5) |