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 'patch/JAL-4195_cli_eps_export_npe' into develop
[jalview.git]
/
src
/
jalview
/
workers
/
AlignCalcManager.java
diff --git
a/src/jalview/workers/AlignCalcManager.java
b/src/jalview/workers/AlignCalcManager.java
index
08ef3a2
..
d81db8c
100644
(file)
--- a/
src/jalview/workers/AlignCalcManager.java
+++ b/
src/jalview/workers/AlignCalcManager.java
@@
-200,11
+200,20
@@
public class AlignCalcManager implements AlignCalcManagerI
@Override
public boolean isWorking()
{
@Override
public boolean isWorking()
{
+ boolean working=false;
synchronized (inProgress)
{
// System.err.println("isWorking "+hashCode());
synchronized (inProgress)
{
// System.err.println("isWorking "+hashCode());
- return inProgress.size() > 0;
+ working |= inProgress.size() > 0;
}
}
+ synchronized (updating)
+ {
+ for (List<AlignCalcWorkerI> workers : updating.values())
+ {
+ working |= workers.size() > 0;
+ }
+ }
+ return working;
}
@Override
}
@Override