From ac1473885367e96cae84a9d3a0b0dec274c5b6bc Mon Sep 17 00:00:00 2001 From: EnzoDLofi Date: Tue, 10 Nov 2026 17:28:37 -0400 Subject: [PATCH] Fix screen effects restoration on cancelled launch --- .../droiddeck/launcher/session/SessionService.kt | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt index 741bf63efe..1ba792348c 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt @@ -1536,20 +1536,17 @@ class SessionService : Service() { val canRestore = gen == sessionGen && SessionState.running && !SessionState.stopRequested && SessionState.mode == MODE_STEAM && + SessionState.gameId == gameId && SessionPrefs.activeScreenEffectsProfileId(this) == queuedProfileId cancelQueuedSteamGame() if (canRestore) { - val restoreGameId = if (SessionState.gameId == gameId) { - previousGameId.also { SessionState.gameId = it } - } else { - SessionState.gameId - } - val restoreProfileId = - SessionPrefs.screenEffectsProfileId(MODE_STEAM, restoreGameId, null) - SessionPrefs.setActiveScreenEffectsProfile(this, restoreProfileId) - SessionPrefs.screenEffects(this, restoreProfileId) + SessionState.gameId = previousGameId + val previousProfileId = + SessionPrefs.screenEffectsProfileId(MODE_STEAM, previousGameId, null) + SessionPrefs.setActiveScreenEffectsProfile(this, previousProfileId) + SessionPrefs.screenEffects(this, previousProfileId) .push(SessionPrefs.upscaler(this)) } return