From 8199fba5cc5ea1d93e71b51cbc0eecf28198cec6 Mon Sep 17 00:00:00 2001 From: crschnick Date: Thu, 10 Aug 2023 15:40:40 +0000 Subject: [PATCH] Search path for terminals on windows as well --- .../io/xpipe/app/prefs/ExternalTerminalType.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/io/xpipe/app/prefs/ExternalTerminalType.java b/app/src/main/java/io/xpipe/app/prefs/ExternalTerminalType.java index adf832d9d..f9a82eec9 100644 --- a/app/src/main/java/io/xpipe/app/prefs/ExternalTerminalType.java +++ b/app/src/main/java/io/xpipe/app/prefs/ExternalTerminalType.java @@ -109,13 +109,17 @@ public interface ExternalTerminalType extends PrefsChoiceValue { @Override public void launch(String name, String file) throws Exception { - var path = determineInstallation(); - if (path.isEmpty()) { - throw new IOException("Unable to find installation of " + toTranslatedString()); + var location = determineFromPath(); + if (location.isEmpty()) { + location = determineInstallation(); + if (location.isEmpty()) { + throw new IOException("Unable to find installation of " + toTranslatedString()); + } } + Optional finalLocation = location; ApplicationHelper.executeLocalApplication( - sc -> createCommand(sc, name, path.get().toString(), file), false); + sc -> createCommand(sc, name, finalLocation.get().toString(), file), false); } protected abstract String createCommand(ShellControl shellControl, String name, String path, String file);