TCF Debugger: fixed missing call of MemoryMapWidget.dispose() in MemoryMapDialog

2 files changed, 10 insertions, 1 deletions

diff --git a/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/commands/MemoryMapDialog.java b/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/commands/MemoryMapDialog.java
index ed59d3e42..582c76a22 100644
--- a/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/commands/MemoryMapDialog.java
+++ b/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/commands/MemoryMapDialog.java
@@ -67,7 +67,6 @@ class MemoryMapDialog extends Dialog {
         try {
             ILaunchConfigurationWorkingCopy copy = cfg.getWorkingCopy();
             if (widget.saveData(copy)) copy.doSave();
-            widget.dispose();
             super.okPressed();
         }
         catch (Throwable x) {
@@ -77,4 +76,10 @@ class MemoryMapDialog extends Dialog {
             mb.open();
         }
     }
+
+    @Override
+    public boolean close() {
+        widget.dispose();
+        return super.close();
+    }
 }
diff --git a/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/commands/MemoryMapWidget.java b/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/commands/MemoryMapWidget.java
index 90c28c23c..66524018b 100644
--- a/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/commands/MemoryMapWidget.java
+++ b/plugins/org.eclipse.tcf.debug.ui/src/org/eclipse/tcf/internal/debug/ui/commands/MemoryMapWidget.java
@@ -998,6 +998,10 @@ public class MemoryMapWidget {
         try {
             String symFileInfo = new TCFTask<String>(channel) {
                 public void run() {
+                    if (selected_mem_map_node == null) {
+                        done(null);
+                        return;
+                    }
                     TCFDataCache<TCFNodeExecContext> mem_cache = model.searchMemoryContext(selected_mem_map_node);
                     if (mem_cache == null) {
                         error(new Exception("Context does not provide memory access")); //$NON-NLS-1$