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

Merge remote-tracking branch 'origin/GP-2452_Dan_traceVersionErrorHandling'

Browse source
This commit is contained in:
Ryan Kurtz 2022-09-09 12:20:54 -04:00
commit 03a456f0c9
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/service/tracemgr/DebuggerTraceManagerServicePlugin.java
View file

@ -692,8 +692,10 @@ public class DebuggerTraceManagerServicePlugin extends Plugin
return trace; return trace;
} }
catch (VersionException e) { catch (VersionException e) {
// TODO: Support upgrading
e = new VersionException(e.getVersionIndicator(), false).combine(e);
VersionExceptionHandler.showVersionError(null, file.getName(), file.getContentType(), VersionExceptionHandler.showVersionError(null, file.getName(), file.getContentType(),
"Open Trace", e); "Open", e);
return null; return null;
} }
catch (IOException e) { catch (IOException e) {

2
Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/DBTraceContentHandler.java
View file

@ -312,7 +312,7 @@ public class DBTraceContentHandler extends DBContentHandler {
@Override @Override
public String getDefaultToolName() { public String getDefaultToolName() {
return "Debugger"; // TODO: Actually make this tool return "Debugger";
} }
@Override @Override