Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoreutarass2010-11-22 23:12:22 +0000
committereutarass2010-11-22 23:12:22 +0000
commit2f9296b70e03dce4f22f1f538f51abd486382bb7 (patch)
treed15adba2113c2b12a7c62e315bee2c3693c04c81 /plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/commands
parent692e6e31aba89952e466fc040adf450a169aff64 (diff)
downloadorg.eclipse.tcf-2f9296b70e03dce4f22f1f538f51abd486382bb7.tar.gz
org.eclipse.tcf-2f9296b70e03dce4f22f1f538f51abd486382bb7.tar.xz
org.eclipse.tcf-2f9296b70e03dce4f22f1f538f51abd486382bb7.zip
TCF Debugger: fixed: NullPointerException when trying to set memory map for a debug context that does not support memory maps.
Diffstat (limited to 'plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/commands')
-rw-r--r--plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/commands/MemoryMapDialog.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/commands/MemoryMapDialog.java b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/commands/MemoryMapDialog.java
index c44c4fd62..198c1b760 100644
--- a/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/commands/MemoryMapDialog.java
+++ b/plugins/org.eclipse.tm.tcf.debug.ui/src/org/eclipse/tm/internal/tcf/debug/ui/commands/MemoryMapDialog.java
@@ -195,7 +195,7 @@ class MemoryMapDialog extends Dialog {
@Override
protected void createButtonsForButtonBar(Composite parent) {
ok_button = createButton(parent, IDialogConstants.OK_ID, "&OK", true);
- ok_button.setEnabled(cfg != null);
+ ok_button.setEnabled(mem_map_id != null);
}
@Override
@@ -486,7 +486,7 @@ class MemoryMapDialog extends Dialog {
@Override
protected void okPressed() {
- if (cfg == null) return;
+ if (mem_map_id == null) return;
boolean loaded_files_ok = true;
for (IMemoryMap.MemoryRegion r : cur_map) {
if (r.getProperties().get(TCFLaunch.PROP_MMAP_ID) != null) {

Back to the top