Changeset 7714 in josm for trunk/src/org/openstreetmap/josm/gui/MapStatus.java

Timestamp:

2014-11-07T20:12:40+01:00 (10 years ago)

Author:

Don-vip

Message:

fix #9564 - NPE

File:

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

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

@@ -475 +475 @@
 
             // This will cycle through the available items.
-            if(firstSelected == null) {
-                ds.addSelected(firstItem);
-            } else {
+            if (firstSelected != null) {
                 ds.clearSelection(firstSelected);
                 if(nextSelected != null) {
                     ds.addSelected(nextSelected);
                 }
+            } else if (firstItem != null) {
+                ds.addSelected(firstItem);
             }
         }