From 57df1744396eefdf43d14646e52bcd56d0f07983 Mon Sep 17 00:00:00 2001 From: crschnick Date: Sun, 29 Oct 2023 21:01:23 +0000 Subject: [PATCH] Look for tabby system-wide --- .../io/xpipe/app/prefs/ExternalTerminalType.java | 16 ++++++++++++---- 1 file changed, 12 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 bfa0932b7..a7d91eff1 100644 --- a/app/src/main/java/io/xpipe/app/prefs/ExternalTerminalType.java +++ b/app/src/main/java/io/xpipe/app/prefs/ExternalTerminalType.java @@ -177,13 +177,21 @@ public interface ExternalTerminalType extends PrefsChoiceValue { @Override protected Optional determineInstallation() { - Optional launcherDir; - launcherDir = WindowsRegistry.readString( + var perUser = WindowsRegistry.readString( WindowsRegistry.HKEY_CURRENT_USER, "SOFTWARE\\71445fac-d6ef-5436-9da7-5a323762d7f5", "InstallLocation") - .map(p -> p + "\\Tabby.exe"); - return launcherDir.map(Path::of); + .map(p -> p + "\\Tabby.exe").map(Path::of); + if (perUser.isPresent()) { + return perUser; + } + + var systemWide = WindowsRegistry.readString( + WindowsRegistry.HKEY_LOCAL_MACHINE, + "SOFTWARE\\71445fac-d6ef-5436-9da7-5a323762d7f5", + "InstallLocation") + .map(p -> p + "\\Tabby.exe").map(Path::of); + return systemWide; } };