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 'features/JAL-2320_closeChimeraAction' into releases/Release_2_10_Branch
[jalview.git]
/
src
/
ext
/
edu
/
ucsf
/
rbvi
/
strucviz2
/
ChimeraManager.java
diff --git
a/src/ext/edu/ucsf/rbvi/strucviz2/ChimeraManager.java
b/src/ext/edu/ucsf/rbvi/strucviz2/ChimeraManager.java
index
736e459
..
439d479
100644
(file)
--- a/
src/ext/edu/ucsf/rbvi/strucviz2/ChimeraManager.java
+++ b/
src/ext/edu/ucsf/rbvi/strucviz2/ChimeraManager.java
@@
-380,6
+380,8
@@
public class ChimeraManager
sendChimeraCommand("stop really", false);
try
{
sendChimeraCommand("stop really", false);
try
{
+ // TODO is this too violent? could it force close the process
+ // before it has done an orderly shutdown?
chimera.destroy();
} catch (Exception ex)
{
chimera.destroy();
} catch (Exception ex)
{
@@
-886,4
+888,9
@@
public class ChimeraManager
{
return busy;
}
{
return busy;
}
+
+ public Process getChimeraProcess()
+ {
+ return chimera;
+ }
}
}