From 1ea8eb6cb308dc708e0fe8bd8346646db0fcb68c Mon Sep 17 00:00:00 2001
From: Kurt Himebauch <136133082+xXJSONDeruloXx@users.noreply.github.com>
Date: Mon, 28 Sep 2026 11:52:02 +0000
Subject: [PATCH] fix(session): cancel a session start that is still setting up

---
 .../java/com/droiddeck/launcher/session/SessionService.kt   | 6 ++++++
 1 file changed, 6 insertions(+)

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 fc529f147..df2529982 100644
--- a/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt
+++ b/app/src/main/java/com/droiddeck/launcher/session/SessionService.kt
@@ -1158,6 +1158,12 @@ class SessionService : Service() {
         }
 
         fun stop(context: Context) {
+            // Not running yet (still downloading or setting up): the start path checks this flag
+            // and cancels, and a service started here would have no session to stop.
+            if (!SessionState.running) {
+                SessionState.stopRequested = true
+                return
+            }
             context.startService(Intent(context, SessionService::class.java).setAction(ACTION_STOP))
         }