X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fbin%2FLauncher.java;fp=src%2Fjalview%2Fbin%2FLauncher.java;h=aec3acd2eade9c356ec43b3f72653cc82c18a9e1;hb=a0fb5883fd17758900fa7e7fd40404626895e5ea;hp=b595b4f4286f326e83063a2761df0471abe5a51d;hpb=e345d5ddc35a0772ac52962555b23cc8024c6168;p=jalview.git

diff --git a/src/jalview/bin/Launcher.java b/src/jalview/bin/Launcher.java
index b595b4f..aec3acd 100644
--- 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();