mirror of
https://github.com/NationalSecurityAgency/ghidra.git
synced 2026-05-27 23:17:03 +08:00
Merge remote-tracking branch 'origin/GP-5235-dragonmacher-decompiler-middle-mouse-bug-fix'
This commit is contained in:
+8
-1
@@ -419,7 +419,9 @@ public class DecompilerPanel extends JPanel implements FieldMouseListener, Field
|
|||||||
|
|
||||||
// Apply the new middle-mouse highlighter when we have rebuilt the token
|
// Apply the new middle-mouse highlighter when we have rebuilt the token
|
||||||
controller.doWhenNotBusy(() -> {
|
controller.doWhenNotBusy(() -> {
|
||||||
activeMiddleMouse.apply();
|
if (activeMiddleMouse != null) {
|
||||||
|
activeMiddleMouse.apply();
|
||||||
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -512,6 +514,11 @@ public class DecompilerPanel extends JPanel implements FieldMouseListener, Field
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (activeMiddleMouse != null) {
|
||||||
|
activeMiddleMouse.clear();
|
||||||
|
activeMiddleMouse = null;
|
||||||
|
}
|
||||||
|
|
||||||
DecompileData oldData = this.decompileData;
|
DecompileData oldData = this.decompileData;
|
||||||
this.decompileData = decompileData;
|
this.decompileData = decompileData;
|
||||||
Function function = decompileData.getFunction();
|
Function function = decompileData.getFunction();
|
||||||
|
|||||||
Reference in New Issue
Block a user