Revision: 20912
http://sourceforge.net/p/jmol/code/20912
Author: hansonr
Date: 2016-01-01 17:03:36 +0000 (Fri, 01 Jan 2016)
Log Message:
-----------
code fix for recent PyMOL reader changes
Modified Paths:
--------------
branches/v14_4/Jmol/src/org/jmol/adapter/readers/pymol/PyMOLScene.java
trunk/Jmol/src/org/jmol/adapter/readers/pymol/PyMOLScene.java
Modified: branches/v14_4/Jmol/src/org/jmol/adapter/readers/pymol/PyMOLScene.java
===================================================================
--- branches/v14_4/Jmol/src/org/jmol/adapter/readers/pymol/PyMOLScene.java
2016-01-01 15:32:36 UTC (rev 20911)
+++ branches/v14_4/Jmol/src/org/jmol/adapter/readers/pymol/PyMOLScene.java
2016-01-01 17:03:36 UTC (rev 20912)
@@ -982,7 +982,7 @@
setting = stateSettings.get(Integer.valueOf(i));
if (setting == null && objectSettings != null)
setting = objectSettings.get(Integer.valueOf(i));
- if (setting == null)
+ if (setting == null && i < settings.size())
setting = (Lst<Object>) settings.get(i);
return setting;
}
Modified: trunk/Jmol/src/org/jmol/adapter/readers/pymol/PyMOLScene.java
===================================================================
--- trunk/Jmol/src/org/jmol/adapter/readers/pymol/PyMOLScene.java
2016-01-01 15:32:36 UTC (rev 20911)
+++ trunk/Jmol/src/org/jmol/adapter/readers/pymol/PyMOLScene.java
2016-01-01 17:03:36 UTC (rev 20912)
@@ -982,7 +982,7 @@
setting = stateSettings.get(Integer.valueOf(i));
if (setting == null && objectSettings != null)
setting = objectSettings.get(Integer.valueOf(i));
- if (setting == null)
+ if (setting == null && i < settings.size())
setting = (Lst<Object>) settings.get(i);
return setting;
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
_______________________________________________
Jmol-commits mailing list
Jmol-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/jmol-commits
