Changeset 10491 in josm for trunk/src

Timestamp:

2016-06-25T12:00:32+02:00 (8 years ago)

Author:

Don-vip

Message:

fix #13000 - Exception when deleting last layer for 2nd time (patch by michael2402) - gsoc-core

Location:

trunk/src/org/openstreetmap/josm/gui/dialogs

Files:

• DialogsPanel.java (modified) (2 diffs)
• ToggleDialog.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/dialogs/DialogsPanel.java

@@ -17 +17 @@
 import org.openstreetmap.josm.tools.CheckParameterUtil;
 import org.openstreetmap.josm.tools.Destroyable;
+import org.openstreetmap.josm.tools.bugreport.BugReport;
 
 /**
@@ -323 +324 @@
     public void destroy() {
         for (ToggleDialog t : allDialogs) {
-            t.destroy();
+            try {
+                t.destroy();
+            } catch (RuntimeException e) {
+                throw BugReport.intercept(e).put("dialog", t).put("dialog-class", t.getClass());
+            }
         }
     }

trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java

@@ -309 +309 @@
             }
         }
+
+        @Override
+        public String toString() {
+            return "ToggleDialogAction [" + ToggleDialog.this.toString() + ']';
+        }
     }