Revision: 20488
http://sourceforge.net/p/jmol/code/20488
Author: hansonr
Date: 2015-05-07 20:27:28 +0000 (Thu, 07 May 2015)
Log Message:
-----------
Jmol.___JmolVersion="14.3.13_2015.05.07b"
bug fix: BIND can cause fault
bug fix: write "?" can cause fault when [x] box is pushed on window
Modified Paths:
--------------
trunk/Jmol/src/org/jmol/scriptext/CmdExt.java
trunk/Jmol/src/org/jmol/viewer/Jmol.properties
trunk/Jmol/src/org/jmol/viewer/binding/Binding.java
Modified: trunk/Jmol/src/org/jmol/scriptext/CmdExt.java
===================================================================
--- trunk/Jmol/src/org/jmol/scriptext/CmdExt.java 2015-05-07 12:27:21 UTC
(rev 20487)
+++ trunk/Jmol/src/org/jmol/scriptext/CmdExt.java 2015-05-07 20:27:28 UTC
(rev 20488)
@@ -579,6 +579,8 @@
params.put("captureMode", T.nameOf(mode).toLowerCase());
params.put("captureLooping", looping ? Boolean.TRUE : Boolean.FALSE);
String msg = vwr.processWriteOrCapture(params);
+ if (msg == null)
+ msg = "canceled";
Logger.info(msg);
}
@@ -3597,6 +3599,8 @@
params.put("height", Integer.valueOf(height));
params.put("nVibes", Integer.valueOf(nVibes));
msg = vwr.processWriteOrCapture(params);
+ if (msg == null)
+ msg = "canceled";
if (isImage && msg.startsWith("OK"))
msg += "; width=" + width + "; height=" + height;
if (timeMsg)
Modified: trunk/Jmol/src/org/jmol/viewer/Jmol.properties
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2015-05-07 12:27:21 UTC
(rev 20487)
+++ trunk/Jmol/src/org/jmol/viewer/Jmol.properties 2015-05-07 20:27:28 UTC
(rev 20488)
@@ -14,8 +14,13 @@
TODO: remove HTML5 dependency on synchronous file loading (check SCRIPT
command for problems)
-Jmol.___JmolVersion="14.3.13_2015.05.07"
+Jmol.___JmolVersion="14.3.13_2015.05.07b"
+bug fix: BIND can cause fault
+bug fix: write "?" can cause fault when [x] box is pushed on window
+
+JmolVersion="14.3.13_2015.05.07"
+
bug fix: x = plane(@1 @2 @3) fails
bug fix: isolated bio groups such as AMP, which are not part of biopolymers,
can result in crashes
Modified: trunk/Jmol/src/org/jmol/viewer/binding/Binding.java
===================================================================
--- trunk/Jmol/src/org/jmol/viewer/binding/Binding.java 2015-05-07 12:27:21 UTC
(rev 20487)
+++ trunk/Jmol/src/org/jmol/viewer/binding/Binding.java 2015-05-07 20:27:28 UTC
(rev 20488)
@@ -308,7 +308,9 @@
Lst<String>[] names = new Lst[actionInfo.length];
Lst<String[]> user = new Lst<String[]>();
for (Object obj : bindings.values()) {
- if (AU.isAS(obj)) {
+ if (obj instanceof Boolean) {
+ // ignore
+ } else if (AU.isAS(obj)) {
String action = ((String[]) obj)[0];
String script = ((String[]) obj)[1];
if (qlow == null || qlow.indexOf("user") >= 0 || action.indexOf(qlow)
>= 0 || script.indexOf(qlow) >= 0)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
One dashboard for servers and applications across Physical-Virtual-Cloud
Widest out-of-the-box monitoring support with 50+ applications
Performance metrics, stats and reports that give you Actionable Insights
Deep dive visibility with transaction tracing using APM Insight.
http://ad.doubleclick.net/ddm/clk/290420510;117567292;y
_______________________________________________
Jmol-commits mailing list
Jmol-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jmol-commits
