From f3b1c43221b4602d4253e4357250b57e3be33521 Mon Sep 17 00:00:00 2001
From: Ben Soares <bsoares@dundee.ac.uk>
Date: Fri, 26 Apr 2019 11:59:34 +0100
Subject: [PATCH] JAL-3233 Added isAMac check for -Xdock:icon addition to
 Launcher command. Added a process.waitFor() so Launcher
 doesn't background Jalview

---
 src/jalview/bin/Launcher.java |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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