Changeset 19314 in josm for trunk/src

Timestamp:

2025-02-13T19:56:00+01:00 (11 days ago)

Author:

stoecker

Message:

fix #21961, fix #24142 - apply patch by Taylor - fix ISE with F11 usage

File:

• trunk/src/org/openstreetmap/josm/actions/FullscreenToggleAction.java (modified) (2 diffs)

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

@@ -57 +57 @@
         Config.getPref().putBoolean("draw.fullscreen", isSelected());
         notifySelectedState();
-        setMode();
+        safeSetMode();
     }
 
@@ -65 +65 @@
     public void initial() {
         if (isSelected()) {
-            setMode();
+            safeSetMode();
+        }
+    }
+
+    protected void safeSetMode() {
+        try {
+            this.setMode();
+        } catch (Exception exception) {
+            // Something happened. Disable fullscreen.
+            Config.getPref().put("draw.fullscreen", null);
+            throw exception;
         }
     }