Changeset 14903 in josm for trunk

Timestamp:

2019-03-19T00:38:58+01:00 (5 years ago)

Author:

Don-vip

Message:

fix #17487 - NPE

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• dialogs/ToggleDialog.java (modified) (1 diff)
• layer/geoimage/ImageViewerDialog.java (modified) (1 diff)

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

@@ -888 +888 @@
 
     protected boolean dockWhenClosingDetachedDlg() {
-        return true;
+        return dialogsPanel != null && titleBar != null;
     }
 

trunk/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java

@@ -507 +507 @@
         if (collapseButtonClicked) {
             collapseButtonClicked = false;
-            return true;
+            return super.dockWhenClosingDetachedDlg();
         }
         return false;