Changeset 13963 in josm

Timestamp:

2018-06-21T16:06:43+02:00 (6 years ago)

Author:

Don-vip

Message:

fix #16410 - workaround for "IllegalArgumentException: Window must not be zero" on Linux (patch by kendzi)

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• MainApplication.java (modified) (1 diff)
• util/WindowGeometry.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/MainApplication.java

@@ -1030 +1030 @@
         // splash can be null sometimes on Linux, in this case try to load JOSM silently
         final SplashProgressMonitor monitor = splash != null ? splash.getProgressMonitor() : new SplashProgressMonitor(null, e -> {
-            Logging.debug(e.toString());
+            if (e != null) {
+                Logging.debug(e.toString());
+            }
         });
         monitor.beginTask(tr("Initializing"));

trunk/src/org/openstreetmap/josm/gui/util/WindowGeometry.java

@@ -343 +343 @@
 
         // Ensure window does not hide taskbar
-
-        Rectangle maxbounds = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
-
-        if (!isBugInMaximumWindowBounds(maxbounds)) {
-            deltax = size.width - maxbounds.width;
-            if (deltax > 0) {
-                size.width -= deltax;
+        try {
+            Rectangle maxbounds = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds();
+
+            if (!isBugInMaximumWindowBounds(maxbounds)) {
+                deltax = size.width - maxbounds.width;
+                if (deltax > 0) {
+                    size.width -= deltax;
+                }
+
+                deltay = size.height - maxbounds.height;
+                if (deltay > 0) {
+                    size.height -= deltay;
+                }
             }
-
-            deltay = size.height - maxbounds.height;
-            if (deltay > 0) {
-                size.height -= deltay;
-            }
+        } catch (IllegalArgumentException e) {
+            // See #16410: IllegalArgumentException: "Window must not be zero" on Linux/X11
+            Logging.error(e);
         }
         window.setLocation(p);