Changeset 17076 in josm for trunk/src/org/openstreetmap/josm/gui/bugreport/JosmUpdatePanel.java

Timestamp:

2020-09-30T00:37:18+02:00 (6 years ago)

Author:

Don-vip

Message:

fix #19860 - prevent illegal state to raise an NPE at JOSM startup on macOS

File:

• trunk/src/org/openstreetmap/josm/gui/bugreport/JosmUpdatePanel.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/bugreport/JosmUpdatePanel.java

@@ -50 +50 @@
 
     private void readCurrentVersion() {
-        int testedVersion = getTestedVersion();
+        try {
+            int testedVersion = getTestedVersion();
 
-        if (testedVersion < 0) {
-            SwingUtilities.invokeLater(this::displayError);
-        } else if (josmVersion < testedVersion) {
-            SwingUtilities.invokeLater(() -> displayOutOfDate(testedVersion));
-        } else {
-            SwingUtilities.invokeLater(this::displayUpToDate);
+            if (testedVersion < 0) {
+                SwingUtilities.invokeLater(this::displayError);
+            } else if (josmVersion < testedVersion) {
+                SwingUtilities.invokeLater(() -> displayOutOfDate(testedVersion));
+            } else {
+                SwingUtilities.invokeLater(this::displayUpToDate);
+            }
+        } catch (RuntimeException e) {
+            Logging.error(e);
         }
     }