From a14dd3049d5eeb3ca1591d36fe2df28c2012c6fe Mon Sep 17 00:00:00 2001 From: EnzoDLofi Date: Tue, 10 Nov 2026 18:36:46 -0400 Subject: [PATCH] Fix per-game screen effects initialization --- .../com/droiddeck/launcher/SessionActivity.kt | 2 +- .../launcher/session/SessionService.kt | 17 +++++++++++------ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index 2d076cff2c..4961e23f5a 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -1352,7 +1352,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde WaylandCompositor.nativeSetUpscaleSharpness(pct) }, onEffects = { e -> - if (drawerOpen && + if ((drawerOpen || (docked && drawerPinned)) && SessionPrefs.activeScreenEffectsProfileId(this@SessionActivity) == effectsEditorProfileId) { SessionPrefs.setScreenEffects(this@SessionActivity, effectsEditorProfileId, e) effects = e 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 1ba792348c..6a3b0d12db 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt @@ -371,12 +371,17 @@ class SessionService : Service() { pipTask = false SessionState.program = intent?.getStringExtra(EXTRA_PROGRAM) SessionState.programArgs = intent?.getStringArrayExtra(EXTRA_PROGRAM_ARGS)?.toList().orEmpty() - SessionState.gameId = intent?.getStringExtra(EXTRA_GAME_ID) SessionState.steamUi = intent?.getStringExtra(EXTRA_STEAM_UI) SessionState.steamUrl = intent?.getStringExtra(EXTRA_STEAM_URL) + val steamUrlGameId = SessionState.steamUrl + ?.takeIf { it.startsWith(GAME_URL_PREFIX) } + ?.removePrefix(GAME_URL_PREFIX) + ?.takeIf(GameLaunchLink::validId) + val resolvedGameId = intent?.getStringExtra(EXTRA_GAME_ID) ?: steamUrlGameId + SessionState.gameId = resolvedGameId SessionPrefs.setActiveScreenEffectsProfile( this, - SessionPrefs.screenEffectsProfileId(SessionState.mode, SessionState.gameId, SessionState.program), + SessionPrefs.screenEffectsProfileId(SessionState.mode, resolvedGameId, SessionState.program), ) com.droiddeck.launcher.stores.battlenet.BattleNetClient.clearRequests(LinuxRuntime.sessionRoot(this)) val gen = synchronized(stopLock) { @@ -398,10 +403,10 @@ class SessionService : Service() { if (SessionPrefs.clearCachedApps(this)) clearCachedApps() cancelQueuedSteamGame(clearMailbox = false) clearSteamGameMailbox() - if (SessionState.mode == MODE_STEAM) SessionState.steamUrl - ?.takeIf { it.startsWith(GAME_URL_PREFIX) }?.let { - watchGameExit(it.removePrefix(GAME_URL_PREFIX), gen, ++gameExitWatchToken) - } + if (SessionState.mode == MODE_STEAM && + SessionState.steamUrl?.startsWith(GAME_URL_PREFIX) == true) { + resolvedGameId?.let { watchGameExit(it, gen, ++gameExitWatchToken) } + } acquireLocks() Thread({ OrphanReaper.reap("session starting")