Changeset 11711 in josm for trunk/src

Timestamp:

2017-03-09T22:56:40+01:00 (7 years ago)

Author:

Don-vip

Message:

fix #13139 - catch IllegalStateException

File:

• trunk/src/org/openstreetmap/josm/actions/MergeLayerAction.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/MergeLayerAction.java

@@ -101 +101 @@
                     setEnabled(false);
                 } else {
-                    final List<Layer> possibleMergeTargets = LayerListDialog.getInstance().getModel().getPossibleMergeTargets(sourceLayer);
-                    setEnabled(!possibleMergeTargets.isEmpty());
+                    try {
+                        setEnabled(!LayerListDialog.getInstance().getModel().getPossibleMergeTargets(sourceLayer).isEmpty());
+                    } catch (IllegalStateException e) {
+                        // May occur when destroying last layer / exiting JOSM, see #14476
+                        setEnabled(false);
+                        Main.error(e);
+                    }
                 }
         });