From ed6f24a2bf64adde873383b0e545ed880a7a80dc Mon Sep 17 00:00:00 2001
From: crschnick <crschnick@xpipe.io>
Date: Sun, 29 Dec 2024 21:27:54 +0000
Subject: [PATCH] Small fixes [stage]

---
 .../java/io/xpipe/app/comp/store/StoreEntryWrapper.java     | 2 +-
 app/src/main/java/io/xpipe/app/core/mode/OperationMode.java | 6 ------
 .../main/java/io/xpipe/app/issue/TerminalErrorHandler.java  | 5 +++++
 .../main/java/io/xpipe/app/terminal/TerminalLauncher.java   | 6 ++++--
 version                                                     | 2 +-
 5 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/io/xpipe/app/comp/store/StoreEntryWrapper.java b/app/src/main/java/io/xpipe/app/comp/store/StoreEntryWrapper.java
index e40dc7c07..983741383 100644
--- a/app/src/main/java/io/xpipe/app/comp/store/StoreEntryWrapper.java
+++ b/app/src/main/java/io/xpipe/app/comp/store/StoreEntryWrapper.java
@@ -93,7 +93,7 @@ public class StoreEntryWrapper {
     }
 
     public boolean isInStorage() {
-        return DataStorage.get().getStoreEntries().contains(entry);
+        return DataStorage.get() != null && DataStorage.get().getStoreEntries().contains(entry);
     }
 
     public void editDialog() {
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 f86bafd4f..4b7c4e1de 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
@@ -36,8 +36,6 @@ public abstract class OperationMode {
     @Getter
     private static boolean inShutdownHook;
 
-    private static boolean windowRequested;
-
     private static OperationMode CURRENT = null;
 
     public static OperationMode map(XPipeDaemonMode mode) {
@@ -122,10 +120,6 @@ public abstract class OperationMode {
     }
 
     public static XPipeDaemonMode getStartupMode() {
-        if (windowRequested) {
-            return XPipeDaemonMode.GUI;
-        }
-
         var arg = AppProperties.get().getArguments().getModeArg();
         if (arg != null) {
             return arg;
diff --git a/app/src/main/java/io/xpipe/app/issue/TerminalErrorHandler.java b/app/src/main/java/io/xpipe/app/issue/TerminalErrorHandler.java
index ba8f50d77..c092869ff 100644
--- a/app/src/main/java/io/xpipe/app/issue/TerminalErrorHandler.java
+++ b/app/src/main/java/io/xpipe/app/issue/TerminalErrorHandler.java
@@ -8,6 +8,7 @@ import io.xpipe.app.core.window.AppDialog;
 import io.xpipe.app.update.XPipeDistributionType;
 import io.xpipe.app.util.Hyperlinks;
 import io.xpipe.app.util.PlatformInit;
+import io.xpipe.app.util.ThreadHelper;
 
 public class TerminalErrorHandler extends GuiErrorHandlerBase implements ErrorHandler {
 
@@ -28,6 +29,7 @@ public class TerminalErrorHandler extends GuiErrorHandlerBase implements ErrorHa
             ErrorAction.ignore().handle(event);
         })) {
             // Exit if we couldn't initialize the GUI
+            ThreadHelper.sleep(1000);
             OperationMode.halt(1);
             return;
         }
@@ -51,6 +53,7 @@ public class TerminalErrorHandler extends GuiErrorHandlerBase implements ErrorHa
             handleProbableUpdate();
         }
 
+        ThreadHelper.sleep(1000);
         OperationMode.halt(1);
     }
 
@@ -60,6 +63,7 @@ public class TerminalErrorHandler extends GuiErrorHandlerBase implements ErrorHa
         var second = ErrorEvent.fromThrowable(t).build();
         log.handle(second);
         ErrorAction.ignore().handle(second);
+        ThreadHelper.sleep(1000);
         OperationMode.halt(1);
     }
 
@@ -82,6 +86,7 @@ public class TerminalErrorHandler extends GuiErrorHandlerBase implements ErrorHa
             var event = ErrorEvent.fromThrowable(t).build();
             log.handle(event);
             ErrorAction.ignore().handle(event);
+            ThreadHelper.sleep(1000);
             OperationMode.halt(1);
         }
     }
diff --git a/app/src/main/java/io/xpipe/app/terminal/TerminalLauncher.java b/app/src/main/java/io/xpipe/app/terminal/TerminalLauncher.java
index b60bd9455..ad0d56ec7 100644
--- a/app/src/main/java/io/xpipe/app/terminal/TerminalLauncher.java
+++ b/app/src/main/java/io/xpipe/app/terminal/TerminalLauncher.java
@@ -29,7 +29,8 @@ public class TerminalLauncher {
                     new TerminalInitScriptConfig(
                             title,
                             type.shouldClear()
-                                    && AppPrefs.get().clearTerminalOnInit().get(),
+                                    && AppPrefs.get().clearTerminalOnInit().get()
+                                    && !AppPrefs.get().developerPrintInitFiles().get(),
                             TerminalInitFunction.none()),
                     true);
             var config = new TerminalLaunchConfiguration(null, title, title, true, script, sc.getShellDialect());
@@ -66,7 +67,8 @@ public class TerminalLauncher {
                 adjustedTitle,
                 !log
                         && type.shouldClear()
-                        && AppPrefs.get().clearTerminalOnInit().get(),
+                        && AppPrefs.get().clearTerminalOnInit().get()
+                        && !AppPrefs.get().developerPrintInitFiles().get(),
                 cc instanceof ShellControl ? type.additionalInitCommands() : TerminalInitFunction.none());
         var config = TerminalLaunchConfiguration.create(request, entry, cleanTitle, adjustedTitle, preferTabs);
         var latch = TerminalLauncherManager.submitAsync(request, cc, terminalConfig, directory);
diff --git a/version b/version
index be382abea..23c30db68 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-14.0-30
+14.0-31