Changeset 17322 in josm for trunk/src/org

Timestamp:

2020-11-17T02:38:27+01:00 (4 years ago)

Author:

Don-vip

Message:

fix #20018 - disable repaint timer when no animation extension is enabled

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• GettingStarted.java (modified) (2 diffs)
• animation/AnimationExtensionManager.java (modified) (1 diff)

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

@@ -155 +155 @@
     @Override
     public void addNotify() {
-        timer.start();
+        if (AnimationExtensionManager.isExtensionEnabled()) {
+            timer.start();
+        }
         super.addNotify();
     }
@@ -161 +163 @@
     @Override
     public void removeNotify() {
-        timer.stop();
+        if (timer.isRunning()) {
+            timer.stop();
+        }
         super.removeNotify();
     }

trunk/src/org/openstreetmap/josm/gui/animation/AnimationExtensionManager.java

@@ -35 +35 @@
     }
 
+    /**
+     * Determines if an extension other than {@link NoExtension} is enabled.
+     * @return {@code true} if an extension other than {@code NoExtension} is enabled.
+     * @since 17322
+     */
+    public static boolean isExtensionEnabled() {
+        return !(getExtension() instanceof NoExtension);
+    }
+
     private static boolean isChristmas() {
         Calendar c = new GregorianCalendar();