From: <ha...@us...> - 2008-08-30 13:29:49
|
Revision: 9810 http://jmol.svn.sourceforge.net/jmol/?rev=9810&view=rev Author: hansonr Date: 2008-08-30 13:29:45 +0000 (Sat, 30 Aug 2008) Log Message: ----------- Modified Paths: -------------- trunk/Jmol/src/org/openscience/jmol/app/Jmol.java Modified: trunk/Jmol/src/org/openscience/jmol/app/Jmol.java =================================================================== --- trunk/Jmol/src/org/openscience/jmol/app/Jmol.java 2008-08-30 13:24:24 UTC (rev 9809) +++ trunk/Jmol/src/org/openscience/jmol/app/Jmol.java 2008-08-30 13:29:45 UTC (rev 9810) @@ -838,10 +838,10 @@ private void dispose(JFrame f) { if (historyFile != null && scriptWindow != null) historyFile.addWindowInfo(SCRIPT_WINDOW_NAME, scriptWindow, null); - if (historyFile != null && webExport != null){ + if (historyFile != null && webExport != null) { WebExport.saveHistory(); WebExport.cleanUp(); - } + } if (numWindows <= 1) { // Close Jmol report(GT._("Closing Jmol...")); @@ -850,9 +850,13 @@ } else { numWindows--; viewer.setModeMouse(JmolConstants.MOUSE_NONE); - f.dispose(); - if (scriptWindow != null) { - scriptWindow.dispose(); + try { + f.dispose(); + if (scriptWindow != null) { + scriptWindow.dispose(); + } + } catch (Exception e) { + // ignore } } } @@ -865,7 +869,7 @@ newFrame.show(); if (state != null) { dispose(f); - j.viewer.script(state); + j.viewer.evalStringQuiet(state); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |