Changeset 10140 in josm for trunk/src/org/openstreetmap/josm/tools

Timestamp:

2016-04-11T16:50:16+02:00 (9 years ago)

Author:

bastiK

Message:

fixed #12748 - Error dialog after deleting a new inserted node

File:

• trunk/src/org/openstreetmap/josm/tools/ImageProvider.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/tools/ImageProvider.java

@@ -83 +83 @@
 import com.kitfox.svg.SVGDiagram;
 import com.kitfox.svg.SVGUniverse;
+import org.openstreetmap.josm.data.osm.DataSet;
 
 /**
@@ -1312 +1313 @@
         // Check if the current styles have special icon for tagged nodes.
         if (primitive instanceof org.openstreetmap.josm.data.osm.Node) {
-            Pair<StyleElementList, Range> nodeStyles = MapPaintStyles.getStyles().generateStyles(primitive, 100, false);
+            Pair<StyleElementList, Range> nodeStyles;
+            DataSet ds = primitive.getDataSet();
+            if (ds != null) {
+                ds.getReadLock().lock();
+            }
+            try {
+                nodeStyles = MapPaintStyles.getStyles().generateStyles(primitive, 100, false);
+            } finally {
+                if (ds != null) {
+                    ds.getReadLock().unlock();
+                }
+            }
             for (StyleElement style : nodeStyles.a) {
                 if (style instanceof NodeElement) {