[Jmol-commits] SF.net SVN: jmol:[11495] branches/v11_8/Jmol/src/org/jmol/viewer

[<ha...@us...>]

Revision: 11495
          http://jmol.svn.sourceforge.net/jmol/?rev=11495&view=rev
Author:   hansonr
Date:     2009-09-07 08:38:01 +0000 (Mon, 07 Sep 2009)

Log Message:
-----------
11.8.4 VERSION

Modified Paths:
--------------
    branches/v11_8/Jmol/src/org/jmol/viewer/Jmol.properties
    branches/v11_8/Jmol/src/org/jmol/viewer/StatusManager.java

Modified: branches/v11_8/Jmol/src/org/jmol/viewer/Jmol.properties
===================================================================
--- branches/v11_8/Jmol/src/org/jmol/viewer/Jmol.properties	2009-09-07 08:36:25 UTC (rev 11494)
+++ branches/v11_8/Jmol/src/org/jmol/viewer/Jmol.properties	2009-09-07 08:38:01 UTC (rev 11495)
@@ -2,8 +2,9 @@
 # NOTE: Generally only bug fixes should be entered here. 
 # NOTE: New features should be introduced in the trunk version 11.9.x
 
-version=11.8.4_dev
+version=11.8.4
 
+# bug fix: "zapped" file does not clear menu
 # bug fix: x = {255,0,0}; select color=x; #did not work
 # bug fix: symop() -- can now be used without "all." 
 #

Modified: branches/v11_8/Jmol/src/org/jmol/viewer/StatusManager.java
===================================================================
--- branches/v11_8/Jmol/src/org/jmol/viewer/StatusManager.java	2009-09-07 08:36:25 UTC (rev 11494)
+++ branches/v11_8/Jmol/src/org/jmol/viewer/StatusManager.java	2009-09-07 08:38:01 UTC (rev 11495)
@@ -341,11 +341,11 @@
   synchronized void setFileLoadStatus(String fullPathName, String fileName,
                                         String modelName, String errorMsg,
                                         int ptLoad, boolean doCallback) {
-    if (fullPathName == null) {
+    if (fullPathName == null && fileName != null && fileName.equals("resetUndo")) {
       JmolAppConsoleInterface appConsole = (JmolAppConsoleInterface) viewer.getProperty("DATA_API", "getAppConsole", null);
-      if (fileName != null && appConsole != null)
+      if (appConsole != null)
         appConsole.zap();
-      return;
+      fileName = "zapped";
     }
     setStatusChanged("fileLoaded", ptLoad, fullPathName, false);
     if (errorMsg != null)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.