Changeset 5414 in josm for trunk/src

Timestamp:

2012-08-10T00:16:34+02:00 (12 years ago)

Author:

Don-vip

Message:

fix #7942 - Unexplained NPE in Conflict Dialog

File:

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

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

@@ -397 +397 @@
                 sel.add((OsmPrimitive)o);
             }
-            Main.main.getCurrentDataSet().setSelected(sel);
+            DataSet ds = Main.main.getCurrentDataSet();
+            if (ds != null) { // Can't see how it is possible but it happened in #7942 
+                ds.setSelected(sel);
+            }
         }