Revision: 18598
http://sourceforge.net/p/jmol/code/18598
Author: hansonr
Date: 2013-08-20 03:06:01 +0000 (Tue, 20 Aug 2013)
Log Message:
-----------
___JmolVersion="13.2.4_dev_2013.08.19"
bug fix: TRY failure in a load command followed by a successful load
having a loadScript will pop past the second TRY and crash Jmol
Modified Paths:
--------------
branches/v13_2/Jmol/src/org/jmol/script/ScriptEvaluator.java
branches/v13_2/Jmol/src/org/jmol/viewer/Jmol.properties
Modified: branches/v13_2/Jmol/src/org/jmol/script/ScriptEvaluator.java
===================================================================
--- branches/v13_2/Jmol/src/org/jmol/script/ScriptEvaluator.java
2013-08-19 23:07:47 UTC (rev 18597)
+++ branches/v13_2/Jmol/src/org/jmol/script/ScriptEvaluator.java
2013-08-20 03:06:01 UTC (rev 18598)
@@ -2240,7 +2240,7 @@
Map<String, SV> cv = contextVariables;
executeCommands(true);
//JavaScript will not return here after DELAY
- while (thisContext.tryPt != tryPt)
+ while (thisContext.tryPt > tryPt)
popContext(false, false);
processTry(cv);
return null;
Modified: branches/v13_2/Jmol/src/org/jmol/viewer/Jmol.properties
===================================================================
--- branches/v13_2/Jmol/src/org/jmol/viewer/Jmol.properties 2013-08-19
23:07:47 UTC (rev 18597)
+++ branches/v13_2/Jmol/src/org/jmol/viewer/Jmol.properties 2013-08-20
03:06:01 UTC (rev 18598)
@@ -9,8 +9,10 @@
# Don't use ___ in your text, as that is the key for stripping out
# the information saved in the JAR version of this file.
-___JmolVersion="13.2.4_dev_2013.08.18"
+___JmolVersion="13.2.4_dev_2013.08.19"
+bug fix: TRY failure in a load command followed by a successful load
+ having a loadScript will pop past the second TRY and crash Jmol
bug fix: translation not read from state
bug fix: CIF reader does not find Hall name for space groups
bug fix: binding names not included in SHOW MOUSE
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Introducing Performance Central, a new site from SourceForge and
AppDynamics. Performance Central is your source for news, insights,
analysis and resources for efficient Application Performance Management.
Visit us today!
http://pubads.g.doubleclick.net/gampad/clk?id=48897511&iu=/4140/ostg.clktrk
_______________________________________________
Jmol-commits mailing list
Jmol-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jmol-commits
