mirror/ghidra
1
0
Fork 0
mirror of https://github.com/NationalSecurityAgency/ghidra.git synced 2026-09-28 17:11:11 -09:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/GP-4835_Dan_fixFfvToggle'

Browse Source
This commit is contained in:
Ryan Kurtz
2024-08-22 08:27:13 -04:00
parent 2e15f67384 611399a110
commit 84040a0426
2 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/memory/DebuggerLegacyRegionsPanel.java
View File

@@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -294,7 +294,6 @@ public class DebuggerLegacyRegionsPanel extends JPanel {
currentTrace = trace; currentTrace = trace;
addNewListeners(); addNewListeners();
loadRegions(); loadRegions();
contextChanged();
} }
public void contextChanged() { public void contextChanged() {

15
Ghidra/Debug/Debugger/src/main/java/ghidra/app/plugin/core/debug/gui/memory/DebuggerRegionsProvider.java
View File

@@ -4,9 +4,9 @@
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -537,12 +537,9 @@ public class DebuggerRegionsProvider extends ComponentProviderAdapter {
@Override @Override
public void contextChanged() { public void contextChanged() {
super.contextChanged(); super.contextChanged();
if (current.getTrace() != null) { Trace trace = current.getTrace();
actionForceFullView.setSelected(current.getTrace() actionForceFullView.setSelected(trace == null ? false
.getProgramView() : trace.getProgramView().getMemory().isForceFullView());
.getMemory()
.isForceFullView());
}
} }
public Entry<Program, MemoryBlock> askBlock(TraceMemoryRegion region, Program program, public Entry<Program, MemoryBlock> askBlock(TraceMemoryRegion region, Program program,
@@ -581,5 +578,7 @@ public class DebuggerRegionsProvider extends ComponentProviderAdapter {
mainPanel.validate(); mainPanel.validate();
} }
} }
contextChanged();
} }
} }