From 00d634ca176660c46c9a60097861b13292893132 Mon Sep 17 00:00:00 2001 From: Dan <46821332+nsadeveloper789@users.noreply.github.com> Date: Thu, 15 May 2025 17:42:38 +0000 Subject: [PATCH] GP-5668: Activate trace on target creation. Tweak message about out-of-date programs. --- .../app/plugin/core/debug/service/tracermi/TraceRmiHandler.java | 1 + .../service/modules/DynamicStaticSynchronizationPlugin.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Ghidra/Debug/Debugger-rmi-trace/src/main/java/ghidra/app/plugin/core/debug/service/tracermi/TraceRmiHandler.java b/Ghidra/Debug/Debugger-rmi-trace/src/main/java/ghidra/app/plugin/core/debug/service/tracermi/TraceRmiHandler.java index 6783a81851..784d329075 100644 --- a/Ghidra/Debug/Debugger-rmi-trace/src/main/java/ghidra/app/plugin/core/debug/service/tracermi/TraceRmiHandler.java +++ b/Ghidra/Debug/Debugger-rmi-trace/src/main/java/ghidra/app/plugin/core/debug/service/tracermi/TraceRmiHandler.java @@ -860,6 +860,7 @@ public class TraceRmiHandler extends AbstractTraceRmiConnection { DoId doId = requireAvailableDoId(req.getOid()); openTraces.put(new OpenTrace(doId, trace, target)); createDeconflictedFile(folder, trace); + doActivate(null, trace, null); return ReplyCreateTrace.getDefaultInstance(); } diff --git a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/service/modules/DynamicStaticSynchronizationPlugin.java b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/service/modules/DynamicStaticSynchronizationPlugin.java index 0ee98ddeb8..4a40d1132f 100644 --- a/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/service/modules/DynamicStaticSynchronizationPlugin.java +++ b/Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/service/modules/DynamicStaticSynchronizationPlugin.java @@ -581,7 +581,7 @@ public class DynamicStaticSynchronizationPlugin extends Plugin { if (consoleService != null) { consoleService.log(DebuggerResources.ICON_MODULES, "Program " + HTMLUtilities.escapeHTML(df.getPathname()) + - " was created with a different version of Ghidra." + + " was imported with a different version of Ghidra." + " It must be opened manually.", ctx); } return;