From c52886f061cf146ec96b840b48f3dc209d43b890 Mon Sep 17 00:00:00 2001
From: Damocles <damocles@darkest.space>
Date: Sat, 18 Apr 2026 13:17:43 +0200
Subject: [PATCH] only auto-switch on player disappearance if it was the
 selected one

---
 shell/services/MprisService.qml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/shell/services/MprisService.qml b/shell/services/MprisService.qml
index bf3a61f..b33ca06 100644
--- a/shell/services/MprisService.qml
+++ b/shell/services/MprisService.qml
@@ -30,10 +30,11 @@ QtObject {
                 playerIdx = idx;
                 return;
             }
+            // Selected player disappeared - switch to best alternative
+            _switchToBest();
+        } else if (playerIdx >= players.length) {
+            playerIdx = 0;
         }
-
-        // Selected player disappeared - switch to most recently playing
-        _switchToBest();
     }
 
     // Watch playback state changes on all players