mirror of
https://github.com/NationalSecurityAgency/ghidra.git
synced 2026-05-24 23:40:52 +08:00
Merge remote-tracking branch 'origin/GP-1-dragonmacher-html-bug-fix'
This commit is contained in:
+4
-4
@@ -33,7 +33,7 @@ import ghidra.util.exception.*;
|
||||
|
||||
public class FunctionEditorModel {
|
||||
public static final String PARSING_MODE_STATUS_TEXT =
|
||||
"<TAB> or <RETURN> to commit edits, <ESC> to abort";
|
||||
HTMLUtilities.escapeHTML("<TAB> or <RETURN> to commit edits, <ESC> to abort");
|
||||
static final String NONE_CHOICE = "-NONE-";
|
||||
|
||||
private String name;
|
||||
@@ -641,9 +641,9 @@ public class FunctionEditorModel {
|
||||
returnInfo.getFormalDataType(), storage);
|
||||
try {
|
||||
if (autoParamCount < oldAutoCount) {
|
||||
if (oldParams.get(
|
||||
autoParamCount).getStorage().getAutoParameterType() != storage
|
||||
.getAutoParameterType()) {
|
||||
if (oldParams.get(autoParamCount)
|
||||
.getStorage()
|
||||
.getAutoParameterType() != storage.getAutoParameterType()) {
|
||||
adjustSelectionForRowRemoved(i);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user