From c3e1a28ba3696ceee08087a8d4a39db679f8f98b Mon Sep 17 00:00:00 2001
From: crschnick <crschnick@xpipe.io>
Date: Fri, 24 Oct 2025 15:48:36 +0000
Subject: [PATCH] wezterm fixes

---
 .../io/xpipe/app/terminal/WezTerminalType.java    | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/io/xpipe/app/terminal/WezTerminalType.java b/app/src/main/java/io/xpipe/app/terminal/WezTerminalType.java
index a4608017b..2b4f43e3f 100644
--- a/app/src/main/java/io/xpipe/app/terminal/WezTerminalType.java
+++ b/app/src/main/java/io/xpipe/app/terminal/WezTerminalType.java
@@ -104,12 +104,12 @@ public interface WezTerminalType extends ExternalTerminalType, TrackableTerminal
         @Override
         public void launch(TerminalLaunchConfiguration configuration) throws Exception {
             boolean runGui = true;
+            var flatpak = FlatpakCache.getApp("org.wezfurlong.wezterm");
             if (configuration.isPreferTabs()) {
                 CommandBuilder base;
                 if (CommandSupport.isInLocalPath("wezterm")) {
                     base = CommandBuilder.of().addFile("wezterm");
                 } else {
-                    var flatpak = FlatpakCache.getApp("org.wezfurlong.wezterm");
                     if (flatpak.isPresent()) {
                         base = CommandBuilder.of().add("flatpak", "run").addQuoted("org.wezfurlong.wezterm");
                     } else {
@@ -117,7 +117,6 @@ public interface WezTerminalType extends ExternalTerminalType, TrackableTerminal
                     }
                 }
 
-
                 runGui = !LocalShell.getShell()
                         .command(CommandBuilder.of()
                                 .add(base)
@@ -127,8 +126,18 @@ public interface WezTerminalType extends ExternalTerminalType, TrackableTerminal
             }
 
             if (runGui) {
+                CommandBuilder base;
+                if (CommandSupport.isInLocalPath("wezterm-gui")) {
+                    base = CommandBuilder.of().addFile("wezterm-gui");
+                } else {
+                    if (flatpak.isPresent()) {
+                        base = CommandBuilder.of().add("flatpak", "run").addQuoted("org.wezfurlong.wezterm");
+                    } else {
+                        base = CommandBuilder.of().addFile("wezterm-gui");
+                    }
+                }
                 ExternalApplicationHelper.startAsync(
-                        CommandBuilder.of().addFile("wezterm-gui").add("start").addFile(configuration.getScriptFile()));
+                        CommandBuilder.of().add(base).add("start").addFile(configuration.getScriptFile()));
             }
         }