Mirrors_Framework/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-05-30 09:45:56 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/patch'

Browse Source
This commit is contained in:
Ryan Kurtz
2026-01-08 12:40:23 -05:00
parent afecdc90ef 1acb4a37a0
commit 4e8ff9e621
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ghidra/Features/PyGhidra/src/main/java/ghidra/pyghidra/PyGhidraTaskMonitor.java
+5 -2
View File
@@ -38,7 +38,7 @@ public class PyGhidraTaskMonitor implements TaskMonitor {
private boolean isIndeterminate; private boolean isIndeterminate;
private volatile boolean isCancelled; private volatile boolean isCancelled;
private Timer timer = new Timer(); private Timer timer;
private WeakSet<CancelledListener> listeners = private WeakSet<CancelledListener> listeners =
WeakDataStructureFactory.createCopyOnReadWeakSet(); WeakDataStructureFactory.createCopyOnReadWeakSet();
private TriConsumer<String, Long, Long> changeCallback; private TriConsumer<String, Long, Long> changeCallback;
@@ -55,6 +55,7 @@ public class PyGhidraTaskMonitor implements TaskMonitor {
TriConsumer<String, Long, Long> changeCallback) { TriConsumer<String, Long, Long> changeCallback) {
isCancelled = false; isCancelled = false;
if (timeoutSecs != null) { if (timeoutSecs != null) {
timer = new Timer(true);
timer.schedule(new PyGhidraTimeOutTask(), timeoutSecs * 1000); timer.schedule(new PyGhidraTimeOutTask(), timeoutSecs * 1000);
} }
this.changeCallback = changeCallback; this.changeCallback = changeCallback;
@@ -143,7 +144,9 @@ public class PyGhidraTaskMonitor implements TaskMonitor {
@Override @Override
public void cancel() { public void cancel() {
timer.cancel(); // Terminate the timer thread if (timer != null) {
timer.cancel(); // Terminate the timer thread
}
isCancelled = true; isCancelled = true;
} }