From 8ec109d7940c24aa6b136829de96c93f63e2fe8a Mon Sep 17 00:00:00 2001 From: crschnick Date: Fri, 17 Apr 2026 10:26:50 +0000 Subject: [PATCH] Multiplexer adjustments [stage] --- .../io/xpipe/app/terminal/TerminalMultiplexer.java | 13 +++++++++---- dist/changelog/22.10.md | 6 +++++- version | 2 +- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/io/xpipe/app/terminal/TerminalMultiplexer.java b/app/src/main/java/io/xpipe/app/terminal/TerminalMultiplexer.java index 5184dba3b..4b83ca802 100644 --- a/app/src/main/java/io/xpipe/app/terminal/TerminalMultiplexer.java +++ b/app/src/main/java/io/xpipe/app/terminal/TerminalMultiplexer.java @@ -1,5 +1,6 @@ package io.xpipe.app.terminal; +import io.xpipe.app.core.AppProperties; import io.xpipe.app.issue.ErrorEvent; import io.xpipe.app.issue.ErrorEventFactory; import io.xpipe.app.process.LocalShell; @@ -24,6 +25,10 @@ public interface TerminalMultiplexer { } static TerminalMultiplexer determineDefault(TerminalMultiplexer existing) { + if (!AppProperties.get().isInitialLaunch()) { + return existing; + } + if (OsType.ofLocal() == OsType.WINDOWS) { return existing; } @@ -33,10 +38,10 @@ public interface TerminalMultiplexer { return existing; } - var all = List.of(new TmuxTerminalMultiplexer(), new ZellijTerminalMultiplexer(), new ScreenTerminalMultiplexer()); - for (TerminalMultiplexer terminalMultiplexer : all) { - if (terminalMultiplexer.shouldSelect()) { - return terminalMultiplexer; + var all = List.of(new TmuxTerminalMultiplexer(), new ZellijTerminalMultiplexer()); + for (TerminalMultiplexer m : all) { + if (m.shouldSelect()) { + return m; } } } catch (Exception e) { diff --git a/dist/changelog/22.10.md b/dist/changelog/22.10.md index d4d3f1c1d..e02787f6f 100644 --- a/dist/changelog/22.10.md +++ b/dist/changelog/22.10.md @@ -7,5 +7,9 @@ - Fix Pageant connections with specified key not opening properly in all cases on Windows - Fix file browser navigation failing to open directories in cmd with certain special characters - Fix PTB communication being broken +- Make newly added scripts be automatically enabled to improve ease of use +- Set multiplexer automatically on initial launch +- Add new dialog to disable latest Windows RDP security warnings - Add identity names to error messages about missing info -- Improve configuration clarity for direct RDP/VNC connections +- Improve configuration clarity for direct RDP/VNC connections +- Make Passwork master key optional diff --git a/version b/version index 42cb25a47..0317c7bac 100644 --- a/version +++ b/version @@ -1 +1 @@ -22.10-4 +22.10-5