From 2d356e6f8ab91e4ce320608d2ccbd03b5e34a569 Mon Sep 17 00:00:00 2001
From: crschnick <crschnick@xpipe.io>
Date: Mon, 11 Nov 2024 13:33:32 +0000
Subject: [PATCH] Shell exit fixes

---
 .../java/io/xpipe/core/store/SingletonSessionStore.java  | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/core/src/main/java/io/xpipe/core/store/SingletonSessionStore.java b/core/src/main/java/io/xpipe/core/store/SingletonSessionStore.java
index a4cc9c69a..4ca6610fb 100644
--- a/core/src/main/java/io/xpipe/core/store/SingletonSessionStore.java
+++ b/core/src/main/java/io/xpipe/core/store/SingletonSessionStore.java
@@ -69,9 +69,12 @@ public interface SingletonSessionStore<T extends Session>
             var ex = getSession();
             setSessionEnabled(false);
             if (ex != null) {
-                ex.stop();
-                setCache("session", null);
-                onStateChange(false);
+                try {
+                    ex.stop();
+                } finally {
+                    setCache("session", null);
+                    onStateChange(false);
+                }
             }
         }
     }