git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'develop' into releases/Release_2_11_2_Branch
[jalview.git]
/
src
/
jalview
/
ext
/
rbvi
/
chimera
/
JalviewChimeraBinding.java
diff --git
a/src/jalview/ext/rbvi/chimera/JalviewChimeraBinding.java
b/src/jalview/ext/rbvi/chimera/JalviewChimeraBinding.java
index
c78a82b
..
399bad9
100644
(file)
--- a/
src/jalview/ext/rbvi/chimera/JalviewChimeraBinding.java
+++ b/
src/jalview/ext/rbvi/chimera/JalviewChimeraBinding.java
@@
-311,7
+311,7
@@
public abstract class JalviewChimeraBinding extends AAStructureBindingModel
@Override
public boolean isViewerRunning()
{
- return chimeraManager.isChimeraLaunched();
+ return chimeraManager!=null && chimeraManager.isChimeraLaunched();
}
/**