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

Tests - fix for timing issue; fixed potential deadlock in TaskDialog

Browse source
This commit is contained in:
dragonmacher 2019-05-29 14:45:25 -04:00
parent 42748eb47e
commit ff7759166b
4 changed files with 21 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Ghidra/Framework/Docking/src/main/java/ghidra/util/task/TaskDialog.java
View file

@ -25,8 +25,7 @@ import javax.swing.*;
import docking.DialogComponentProvider;
import docking.DockingWindowManager;
import docking.widgets.OptionDialog;
import ghidra.util.HelpLocation;
import ghidra.util.SystemUtilities;
import ghidra.util.*;
import ghidra.util.exception.CancelledException;
import ghidra.util.timer.GTimer;
@ -205,12 +204,12 @@ public class TaskDialog extends DialogComponentProvider implements TaskMonitor {
@Override
public void setCancelEnabled(boolean enable) {
monitorComponent.setCancelEnabled(enable);
super.setCancelEnabled(enable);
Swing.runLater(() -> super.setCancelEnabled(enable));
}
@Override
public boolean isCancelEnabled() {
return super.isCancelEnabled();
return monitorComponent.isCancelEnabled();
}
public synchronized void taskProcessed() {
@ -317,7 +316,7 @@ public class TaskDialog extends DialogComponentProvider implements TaskMonitor {
@Override
public String getMessage() {
return monitorComponent.getMessage();
return getStatusText();
}
@Override