From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Fri, 2 Dec 2016 15:17:37 +0000 (+0000)
Subject: Merge branch 'develop' into features/JAL-2295setChimeraAttributes
X-Git-Tag: Release_2_11_0~62^2~38
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=abd0918cc633b946cfea588ef4b4d666edf9fc8b;p=jalview.git

Merge branch 'develop' into features/JAL-2295setChimeraAttributes

Conflicts:
	src/jalview/ext/rbvi/chimera/JalviewChimeraBinding.java
---

abd0918cc633b946cfea588ef4b4d666edf9fc8b
diff --cc src/jalview/ext/rbvi/chimera/JalviewChimeraBinding.java
index 1ff0466,262b8a2..75ddc9c
--- a/src/jalview/ext/rbvi/chimera/JalviewChimeraBinding.java
+++ b/src/jalview/ext/rbvi/chimera/JalviewChimeraBinding.java
@@@ -287,8 -318,13 +320,12 @@@ public abstract class JalviewChimeraBin
        chimeraListener.shutdown();
        chimeraListener = null;
      }
 -    lastCommand = null;
      viewer = null;
  
+     if (chimeraMonitor != null)
+     {
+       chimeraMonitor.interrupt();
+     }
      releaseUIResources();
    }