Nixyri/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2024-11-29 07:31:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-2722_Dan_dontTimeoutTheHuman' into patch

Browse Source
This commit is contained in:
Ryan Kurtz 2022-11-10 01:21:55 -05:00
commit e5db51a070
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/service/model/launch/AbstractDebuggerProgramLaunchOffer.java
View File

@ -591,8 +591,11 @@ public abstract class AbstractDebuggerProgramLaunchOffer implements DebuggerProg
monitor.incrementProgress(1);
monitor.setMessage("Launching");
locals.futureTarget = listenForTarget(l.getModel());
if (prompt) {
return launch(l, true, configurator);
}
return AsyncTimer.DEFAULT_TIMER.mark()
.timeOut(launch(l, prompt, configurator), getTimeoutMillis(),
.timeOut(launch(l, false, configurator), getTimeoutMillis(),
() -> onTimedOutLaunch(monitor));
}).thenCompose(__ -> {
checkCancelled(monitor);