diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index f8e56fb41f..1287a86ac4 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -5260,19 +5260,19 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback, com.droidde observedScreenEffectsProfileId = SessionPrefs.activeScreenEffectsProfileId(this) readPrefs() observedScreenEffectsProfileId = SessionPrefs.activeScreenEffectsProfileId(this) - val activeProfileId = SessionPrefs.activeScreenEffectsProfileId(this) - observedScreenEffectsProfileId = activeProfileId - val activeEffects = SessionPrefs.screenEffects(this, activeProfileId) - val activeUpscaler = SessionPrefs.screenEffectsUpscaler(this, activeProfileId) - if (screenEffectsTarget == SCREEN_EFFECTS_TARGET_AUTO) { - effects = activeEffects - upscaler = activeUpscaler - } else { - effects = SessionPrefs.screenEffects(this, screenEffectsProfileIdForTarget(screenEffectsTarget)) - } if (CompositorHost.isStarted) { - WaylandCompositor.nativeSetUpscaler(activeUpscaler) - activeEffects.push(activeUpscaler) + // Restore the running game's profile to the live output. + syncActiveScreenEffectsProfile() + } else if (screenEffectsTarget == SCREEN_EFFECTS_TARGET_AUTO) { + effects = SessionPrefs.screenEffects(this, observedScreenEffectsProfileId) + upscaler = SessionPrefs.screenEffectsUpscaler(this, observedScreenEffectsProfileId) + } + + // Keep the selected editor profile separate from the live output. + if (screenEffectsTarget != SCREEN_EFFECTS_TARGET_AUTO) { + val editorProfileId = screenEffectsProfileIdForTarget(screenEffectsTarget) + effects = SessionPrefs.screenEffects(this, editorProfileId) + upscaler = SessionPrefs.screenEffectsUpscaler(this, editorProfileId) } refreshInputProfile() refreshControls()