Prefer old explicit leader as soft leader after disabling it.

daschuer · Sep 30, 2023 · a35cddf · a35cddf
1 parent ef420c0
commit a35cddf
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/engine/sync/enginesync.cpp b/src/engine/sync/enginesync.cpp
@@ -46,8 +46,7 @@ void EngineSync::requestSyncMode(Syncable* pSyncable, SyncMode mode) {
     // decks that need to change as a result.
     Syncable* oldLeader = m_pLeaderSyncable;
     switch (mode) {
-    case SyncMode::LeaderExplicit:
-    case SyncMode::LeaderSoft: {
+    case SyncMode::LeaderExplicit: {
         if (pSyncable->getBaseBpm().isValid()) {
             activateLeader(pSyncable, mode);
         } else {
@@ -58,6 +57,15 @@ void EngineSync::requestSyncMode(Syncable* pSyncable, SyncMode mode) {
         }
         break;
     }
+    case SyncMode::LeaderSoft: {
+        if (pSyncable->getBaseBpm().isValid() &&
+                pSyncable->isPlaying() &&
+                pSyncable->isAudible()) {
+            activateLeader(pSyncable, mode);
+            break;
+        }
+        [[fallthrough]];
+    }
     case SyncMode::Follower: {
         Syncable* pNewLeader = pickNewLeader(pSyncable);
         if (pNewLeader == pSyncable) {

diff --git a/src/engine/sync/synccontrol.cpp b/src/engine/sync/synccontrol.cpp
@@ -519,6 +519,8 @@ void SyncControl::slotSyncLeaderEnabledChangeRequest(double state) {
         // Turning off leader goes back to follower mode.
         switch (mode) {
         case SyncMode::LeaderExplicit:
+            m_pChannel->getEngineBuffer()->requestSyncMode(SyncMode::LeaderSoft);
+            break;
         case SyncMode::LeaderSoft:
             m_pChannel->getEngineBuffer()->requestSyncMode(SyncMode::Follower);
             break;