mirror of
https://github.com/NationalSecurityAgency/ghidra.git
synced 2026-08-17 16:03:03 +08:00
GP-6940 - Fixed a bug in function editor namespace combo box when tabbing from signature
This commit is contained in:
+6
@@ -17,6 +17,7 @@ package ghidra.app.plugin.core.function.editor;
|
||||
|
||||
import java.util.*;
|
||||
|
||||
import generic.json.Json;
|
||||
import ghidra.program.model.data.VoidDataType;
|
||||
import ghidra.program.model.lang.PrototypeModel;
|
||||
import ghidra.program.model.listing.*;
|
||||
@@ -80,6 +81,11 @@ class FunctionDataView {
|
||||
callFixupName = otherFunctionData.callFixupName;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return Json.toString(this);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean equals(Object obj) {
|
||||
if (!(obj instanceof FunctionDataView otherFunctionData)) {
|
||||
|
||||
+9
-1
@@ -1050,8 +1050,16 @@ public class FunctionEditorModel {
|
||||
// ignore
|
||||
}
|
||||
|
||||
Namespace ns = createNamespace(result.namespace());
|
||||
// We allow the user to omit the namespace when parsing the signature. If the value is
|
||||
// null, then don't change the current value. Assume any non-null value is a valid choice.
|
||||
Namespace ns = functionData.getNamespace();
|
||||
SymbolPath nsPath = result.namespace();
|
||||
if (nsPath != null) {
|
||||
ns = createNamespace(result.namespace());
|
||||
}
|
||||
|
||||
setFunctionData(ns, f);
|
||||
|
||||
isInParsingMode = false;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user