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-4611_d-millar_better_launch_defaults'

Browse source
This commit is contained in:
Ryan Kurtz 2025-03-24 15:18:47 -04:00
commit 8d18be9e39
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Ghidra/Debug/Debugger-rmi-trace/src/main/java/ghidra/app/plugin/core/debug/gui/tracermi/launcher/AbstractTraceRmiLaunchOffer.java
View file

@ -224,8 +224,8 @@ public abstract class AbstractTraceRmiLaunchOffer implements TraceRmiLaunchOffer
}
protected void saveState(SaveState state) {
if (program == null) {
plugin.writeToolLaunchConfig(getConfigName(), state);
if (program == null) {
return;
}
plugin.writeProgramLaunchConfig(program, getConfigName(), state);
@ -415,10 +415,15 @@ public abstract class AbstractTraceRmiLaunchOffer implements TraceRmiLaunchOffer
}
protected SaveState loadState(boolean forPrompt) {
SaveState state = plugin.readToolLaunchConfig(getConfigName());
if (program == null) {
return plugin.readToolLaunchConfig(getConfigName());
return state;
}
return plugin.readProgramLaunchConfig(program, getConfigName(), forPrompt);
SaveState pstate = plugin.readProgramLaunchConfig(program, getConfigName(), forPrompt);
if (!pstate.isEmpty()) {
state = pstate;
}
return state;
}
/**