From: Ben Soares <bsoares@dundee.ac.uk>
Date: Fri, 26 Apr 2019 10:59:34 +0000 (+0100)
Subject: JAL-3233 Added isAMac check for -Xdock:icon addition to Launcher command. Added a... 
X-Git-Tag: Release_2_11_0~17^2~2
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=f3b1c43221b4602d4253e4357250b57e3be33521;p=jalview.git

JAL-3233 Added isAMac check for -Xdock:icon addition to Launcher command. Added a process.waitFor() so Launcher doesn't background Jalview
---

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();