From d635559f6629c8dc15c1dbde8bad393e6da007e0 Mon Sep 17 00:00:00 2001
From: crschnick <crschnick@xpipe.io>
Date: Sat, 14 Feb 2026 08:00:44 +0000
Subject: [PATCH] Various fixes [stage]

---
 .../main/java/io/xpipe/app/terminal/TerminalDockHubComp.java  | 2 +-
 .../java/io/xpipe/app/terminal/TerminalDockHubManager.java    | 4 ++++
 version                                                       | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/io/xpipe/app/terminal/TerminalDockHubComp.java b/app/src/main/java/io/xpipe/app/terminal/TerminalDockHubComp.java
index 160e9b429..885d50e7b 100644
--- a/app/src/main/java/io/xpipe/app/terminal/TerminalDockHubComp.java
+++ b/app/src/main/java/io/xpipe/app/terminal/TerminalDockHubComp.java
@@ -124,7 +124,7 @@ public class TerminalDockHubComp extends SimpleRegionBuilder {
     }
 
     private void update(Region region) {
-        if (region.getScene() == null || region.getScene().getWindow() == null) {
+        if (region.getScene() == null || region.getScene().getWindow() == null || NativeWinWindowControl.MAIN_WINDOW == null) {
             return;
         }
 
diff --git a/app/src/main/java/io/xpipe/app/terminal/TerminalDockHubManager.java b/app/src/main/java/io/xpipe/app/terminal/TerminalDockHubManager.java
index 5964d4552..011c5a36f 100644
--- a/app/src/main/java/io/xpipe/app/terminal/TerminalDockHubManager.java
+++ b/app/src/main/java/io/xpipe/app/terminal/TerminalDockHubManager.java
@@ -63,6 +63,10 @@ public class TerminalDockHubManager {
             return false;
         }
 
+        if (NativeWinWindowControl.MAIN_WINDOW == null) {
+            return false;
+        }
+
         return true;
     }
 
diff --git a/version b/version
index 43bc083d1..27040fe00 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-21.3-2
+21.3-3