Changeset 762 in josm for trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java

Timestamp:

2008-08-11T00:23:12+02:00 (16 years ago)

Author:

stoecker

Message:

fix exception - closes #1327

File:

• trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/markerlayer/MarkerLayer.java

@@ -302 +302 @@
                 AudioMarker newAudioMarker = AudioMarker.create(Main.proj.eastNorth2latlon(en), 
                         AudioMarker.inventName(offset), AudioPlayer.url().toString(), this, time, offset);
-                
+
                 // insert it at the right place in a copy the collection
                 Collection<Marker> newData = new ArrayList<Marker>();
-                am = null; 
+                am = null;
+                AudioMarker ret = newAudioMarker; // save to have return value
                 for (Marker m : data) {
                         if (m.getClass() == AudioMarker.class) {
@@ -317 +318 @@
                         newData.add(m);
                 }
+
                 if (newAudioMarker != null) {
                         if (am != null)
-                                newAudioMarker.adjustOffset(am.syncOffset()); // i.e. same as predecessor                               
+                                newAudioMarker.adjustOffset(am.syncOffset()); // i.e. same as predecessor
                         newData.add(newAudioMarker); // insert at end
                 }
-                
+
                 // replace the collection
                 data.clear();
                 data.addAll(newData);
-                return newAudioMarker;
+                return ret;
         }