From: gmungoc <g.m.carstairs@dundee.ac.uk>
Date: Thu, 23 Jun 2016 14:26:03 +0000 (+0100)
Subject: JAL-2130 now simply viewer.dispose() to close down Jmol threads
X-Git-Tag: Release_2_10_0~156^2
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=5af8112b583306236ff312b22a9a5c011b4761a9;p=jalview.git

JAL-2130 now simply viewer.dispose() to close down Jmol threads
---

diff --git a/src/jalview/ext/jmol/JalviewJmolBinding.java b/src/jalview/ext/jmol/JalviewJmolBinding.java
index 2133f2b..2ccf118 100644
--- a/src/jalview/ext/jmol/JalviewJmolBinding.java
+++ b/src/jalview/ext/jmol/JalviewJmolBinding.java
@@ -57,7 +57,6 @@ import org.jmol.api.JmolStatusListener;
 import org.jmol.api.JmolViewer;
 import org.jmol.c.CBK;
 import org.jmol.script.T;
-import org.jmol.viewer.JC;
 import org.jmol.viewer.Viewer;
 
 public abstract class JalviewJmolBinding extends AAStructureBindingModel
@@ -170,13 +169,9 @@ public abstract class JalviewJmolBinding extends AAStructureBindingModel
 
   public void closeViewer()
   {
-    viewer.acm.setModeMouse(JC.MOUSE_NONE);
     // remove listeners for all structures in viewer
     getSsm().removeStructureViewerListener(this, this.getPdbFile());
-    // and shut down jmol
-    viewer.evalStringQuiet("zap");
-    viewer.setJmolStatusListener(null);
-    viewer.dispose();
+     viewer.dispose();
     lastCommand = null;
     viewer = null;
     releaseUIResources();