Changeset 15385 in josm for trunk/src/org/openstreetmap

Timestamp:

2019-09-29T00:05:29+02:00 (5 years ago)

Author:

Don-vip

Message:

fix #18178 - NPE

File:

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

trunk/src/org/openstreetmap/josm/gui/dialogs/NotesDialog.java

@@ -14 +14 @@
 import java.util.Collection;
 import java.util.List;
+import java.util.Objects;
 
 import javax.swing.AbstractAction;
@@ -155 +156 @@
     public void layerRemoving(LayerRemoveEvent e) {
         if (e.getRemovedLayer() instanceof NoteLayer) {
-            noteData.removeNoteDataUpdateListener(this);
-            noteData = null;
-            model.clearData();
-            MapFrame map = MainApplication.getMap();
-            if (map.mapMode instanceof AddNoteAction) {
-                map.selectMapMode(map.mapModeSelect);
+            NoteData removedNoteData = ((NoteLayer) e.getRemovedLayer()).getNoteData();
+            removedNoteData.removeNoteDataUpdateListener(this);
+            if (Objects.equals(noteData, removedNoteData)) {
+                noteData = null;
+                model.clearData();
+                MapFrame map = MainApplication.getMap();
+                if (map.mapMode instanceof AddNoteAction) {
+                    map.selectMapMode(map.mapModeSelect);
+                }
             }
         }