Changeset 8116 in josm for trunk/src/org

Timestamp:

2015-03-05T17:48:42+01:00 (11 years ago)

Author:

Don-vip

Message:

fix #11206 - NPE

File:

• trunk/src/org/openstreetmap/josm/gui/NotificationManager.java (modified) (2 diffs)

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

@@ -150 +150 @@
         public void actionPerformed(ActionEvent e) {
             hideTimer.stop();
-            currentNotificationPanel.setVisible(false);
-            ((JFrame) Main.parent).getLayeredPane().remove(currentNotificationPanel);
-            currentNotificationPanel = null;
+            if (currentNotificationPanel != null) {
+                currentNotificationPanel.setVisible(false);
+                ((JFrame) Main.parent).getLayeredPane().remove(currentNotificationPanel);
+                currentNotificationPanel = null;
+            }
             pauseTimer.restart();
         }
@@ -172 +174 @@
         @Override
         public void actionPerformed(ActionEvent e) {
-            currentNotificationPanel.setNotificationBackground(PANEL_SEMITRANSPARENT);
-            currentNotificationPanel.repaint();
+            if (currentNotificationPanel != null) {
+                currentNotificationPanel.setNotificationBackground(PANEL_SEMITRANSPARENT);
+                currentNotificationPanel.repaint();
+            }
             startHideTimer();
         }