yetangitu/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2025-10-06 03:50:02 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-628-dragonmacher-dialog-issues'

Browse source 
(fixes #2398, #2480)
This commit is contained in:
ghidra1 2021-02-16 13:02:28 -05:00
commit 0d01b72af9
29 changed files with 303 additions and 195 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Ghidra/Framework/Generic/src/main/java/ghidra/util/task/WrappingTaskMonitor.java
View file

@ -68,10 +68,16 @@ public class WrappingTaskMonitor implements TaskMonitor {
delegate.removeCancelledListener(l);
}
newDelegate.initialize(delegate.getMaximum());
if (delegate.isIndeterminate()) {
newDelegate.setIndeterminate(true);
}
else {
newDelegate.setIndeterminate(false);
newDelegate.initialize(delegate.getMaximum());
}
newDelegate.setProgress(delegate.getProgress());
newDelegate.setMessage(delegate.getMessage());
newDelegate.setIndeterminate(delegate.isIndeterminate());
newDelegate.setCancelEnabled(delegate.isCancelEnabled());
this.delegate = newDelegate;