Changeset 19143 in josm for trunk

Timestamp:

2024-07-15T23:29:48+02:00 (4 months ago)

Author:

taylor.smock

Message:

Fix #23804: xdg-open can return a 0 exit code when a browser doesn't open

This is alleviated by switching the default order of browser.unix to be
#DESTKOP then xdg-open. #DESKTOP is our magic value for using built-in
Java methods for opening a browser.

It appears that there is a race condition somewhere for the Brave browser.
I suspect that the process returned by the Runtime.exec and xdg-open isn't
actually complete when it says it is, and so the process is cleaned up prior to
Brave actually launching.

File:

• trunk/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/tools/PlatformHookUnixoid.java

@@ -69 +69 @@
     @Override
     public void openUrl(String url) throws IOException {
+        // Note: xdg-open may not always give "expected" results, see #23804.
+        // At the time, it appeared to be primarily a Brave browser problem.
         for (String program : Config.getPref().getList("browser.unix",
-                Arrays.asList("xdg-open", "#DESKTOP#", "$BROWSER", "gnome-open", "kfmclient openURL", "firefox"))) {
+                Arrays.asList("#DESKTOP#", "xdg-open", "$BROWSER", "gnome-open", "kfmclient openURL", "firefox"))) {
             try {
                 if ("#DESKTOP#".equals(program)) {
                     Desktop.getDesktop().browse(Utils.urlToURI(url));
-                } else if (program.startsWith("$")) {
-                    program = System.getenv().get(program.substring(1));
-                    Runtime.getRuntime().exec(new String[]{program, url});
                 } else {
+                    if (program.startsWith("$")) {
+                        program = System.getenv().get(program.substring(1));
+                    }
                     Runtime.getRuntime().exec(new String[]{program, url});
                 }