Bamboo test #13

[jalview.git] / src / jalview / gui / Desktop.java

diff --git a/src/jalview/gui/Desktop.java b/src/jalview/gui/Desktop.java
index e13a63e..cc4cc48 100644 (file)
--- a/src/jalview/gui/Desktop.java
+++ b/src/jalview/gui/Desktop.java
@@ -361,7 +361,7 @@ public class Desktop extends GDesktop
    */
   public static Desktop getInstance()
   {
-    return Jalview.isHeadlessMode() ? null
+    return Jalview.isHeadlessMode() || Jalview.isSynchronous() ? null
             : (Desktop) ApplicationSingletonProvider
                     .getInstance(Desktop.class);
   }
@@ -903,7 +903,7 @@ public class Desktop extends GDesktop
     // A HEADLESS STATE WHEN NO DESKTOP EXISTS. MUST RETURN
     // IF JALVIEW IS RUNNING HEADLESS
     // ///////////////////////////////////////////////
-    if (Jalview.isHeadlessMode())
+    if (Jalview.isHeadlessMode() || Jalview.isSynchronous())
     {
       return;
     }