Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop

[jalview.git] / src / jalview / bin / Launcher.java

diff --git a/src/jalview/bin/Launcher.java b/src/jalview/bin/Launcher.java
index b595b4f..aec3acd 100644 (file)
--- a/src/jalview/bin/Launcher.java
+++ b/src/jalview/bin/Launcher.java
@@ -67,7 +67,7 @@ public class Launcher
       }
     }
 
-    if (!dockIcon)
+    if (!dockIcon && isAMac)
     {
       command.add("-Xdock:icon=" + dockIconPath);
       // -Xdock:name=... doesn't actually work :(
@@ -85,7 +85,8 @@ public class Launcher
     try
     {
       builder.inheritIO();
-      builder.start();
+      Process process = builder.start();
+      process.waitFor();
     } catch (Exception e)
     {
       e.printStackTrace();