From eeeba13b6c8c33a60b79177d01d110304f5af16d Mon Sep 17 00:00:00 2001 From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com> Date: Mon, 28 Sep 2026 11:52:03 +0000 Subject: [PATCH] fix(session): keep a retried session's first-frame and hud listeners --- .../com/droiddeck/launcher/SessionActivity.kt | 17 +++++++++-------- .../com/droiddeck/launcher/session/PerfHud.kt | 2 +- .../launcher/wayland/WaylandCompositor.java | 11 +++++++++++ 3 files changed, 21 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt index d10c89eb08..ae6c63ec47 100644 --- a/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt +++ b/app/src/main/java/com/droiddeck/launcher/SessionActivity.kt @@ -264,13 +264,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { handleHomeGuideIntent(intent) updateOnScreenControls() - WaylandCompositor.setFirstFrameListener { - SessionEvents.firstFrame() - runOnUiThread { - loading.visible = false - hud.start() - } - } + WaylandCompositor.setFirstFrameListener(firstFrameListener) SessionEvents.markReadyIfPossible() SessionState.endListener = endListener // A single Back opens the session menu; two quick presses/swipes send the Steam QAM chord. @@ -1537,6 +1531,13 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { /** Ours, so a finishing activity never unhooks the one that replaced it. */ private val endListener: (Int) -> Unit = { status -> onSessionEnded(status) } + private val firstFrameListener = Runnable { + SessionEvents.firstFrame() + runOnUiThread { + loading.visible = false + hud.start() + } + } override fun onDestroy() { // Deliberately does NOT end the session: this activity can be destroyed while the user is @@ -1549,7 +1550,7 @@ class SessionActivity : ComponentActivity(), SurfaceHolder.Callback { if (::hud.isInitialized) hud.stop() padBridge?.stop() if (SessionState.endListener === endListener) SessionState.endListener = null - WaylandCompositor.setFirstFrameListener(null) + WaylandCompositor.clearFirstFrameListener(firstFrameListener) super.onDestroy() } diff --git a/app/src/main/java/com/droiddeck/launcher/session/PerfHud.kt b/app/src/main/java/com/droiddeck/launcher/session/PerfHud.kt index ae3326c1e8..b0d49257bd 100644 --- a/app/src/main/java/com/droiddeck/launcher/session/PerfHud.kt +++ b/app/src/main/java/com/droiddeck/launcher/session/PerfHud.kt @@ -81,7 +81,7 @@ class PerfHud(context: Context) { fun stop() { running = false - WaylandCompositor.setGameListener(null) + WaylandCompositor.clearGameListener(listener) text = "" } diff --git a/app/src/main/java/com/droiddeck/launcher/wayland/WaylandCompositor.java b/app/src/main/java/com/droiddeck/launcher/wayland/WaylandCompositor.java index ffd1a28e5a..0af6057a54 100644 --- a/app/src/main/java/com/droiddeck/launcher/wayland/WaylandCompositor.java +++ b/app/src/main/java/com/droiddeck/launcher/wayland/WaylandCompositor.java @@ -26,6 +26,12 @@ public final class WaylandCompositor { * listener must marshal to the UI thread itself. */ public static void setFirstFrameListener(Runnable r) { firstFrameListener = r; } + /** Clears the first-frame listener only if it is still {@code r}, so an activity going away + * never drops the one its replacement registered. */ + public static synchronized void clearFirstFrameListener(Runnable r) { + if (firstFrameListener == r) firstFrameListener = null; + } + /** Invoked from native (banner_on_first_frame) on the first present. */ @SuppressWarnings("unused") static void onFirstFramePresented() { @@ -52,6 +58,11 @@ public final class WaylandCompositor { public static void setGameListener(GameListener l) { gameListener = l; } + /** Clears the game listener only if it is still {@code l}. */ + public static synchronized void clearGameListener(GameListener l) { + if (gameListener == l) gameListener = null; + } + /** Invoked from native (banner_on_game_surface). */ @SuppressWarnings("unused") static void onGameSurface(String window, String gpuName) {