From a4ba5d972621a97e3d9dbe901470f6f57d3286b6 Mon Sep 17 00:00:00 2001
From: crschnick <crschnick@xpipe.io>
Date: Thu, 30 Nov 2023 17:29:51 +0000
Subject: [PATCH] Don't block on shutdown kill

---
 app/src/main/java/io/xpipe/app/core/mode/OperationMode.java | 6 ++++++
 .../main/java/io/xpipe/app/launcher/LauncherCommand.java    | 1 -
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/io/xpipe/app/core/mode/OperationMode.java b/app/src/main/java/io/xpipe/app/core/mode/OperationMode.java
index 17905db7..9c119298 100644
--- a/app/src/main/java/io/xpipe/app/core/mode/OperationMode.java
+++ b/app/src/main/java/io/xpipe/app/core/mode/OperationMode.java
@@ -230,6 +230,12 @@ public abstract class OperationMode {
     }
 
     public static void shutdown(boolean inShutdownHook, boolean hasError) {
+        // In case we are stuck while in shutdown, allow for an external kill command to instantly exit this application
+        if (inShutdown && inShutdownHook) {
+            TrackEvent.info("Received SIGTERM while in shutdown. Halting ...");
+            OperationMode.halt(1);
+        }
+
         if (inShutdown) {
             return;
         }
diff --git a/app/src/main/java/io/xpipe/app/launcher/LauncherCommand.java b/app/src/main/java/io/xpipe/app/launcher/LauncherCommand.java
index c1f96758..e9b5f1cc 100644
--- a/app/src/main/java/io/xpipe/app/launcher/LauncherCommand.java
+++ b/app/src/main/java/io/xpipe/app/launcher/LauncherCommand.java
@@ -8,7 +8,6 @@ import io.xpipe.app.issue.LogErrorHandler;
 import io.xpipe.app.issue.TrackEvent;
 import io.xpipe.app.prefs.AppPrefs;
 import io.xpipe.app.util.ThreadHelper;
-import io.xpipe.beacon.BeaconException;
 import io.xpipe.beacon.BeaconServer;
 import io.xpipe.beacon.exchange.FocusExchange;
 import io.xpipe.beacon.exchange.OpenExchange;