Changeset 233 in josm for src/org/openstreetmap

Timestamp:

2007-05-08T22:34:53+02:00 (18 years ago)

Author:

framm

Message:

Do not clear the command history if an upload fails completely.
Fixes #138.

File:

• src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (modified) (2 diffs)

src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

@@ -228 +228 @@
          */
         public void cleanData(final Collection<OsmPrimitive> processed, boolean dataAdded) {
+
+                // return immediately if nothing really happened (typically when upload
+                // aborts due to a server connection error)
+                if ((processed == null || processed.isEmpty()) && !dataAdded)
+                        return;
+                
                 redoCommands.clear();
                 commands.clear();
@@ -243 +249 @@
 
                 // update the modified flag
-
                 if (fromDisk && processed != null && !dataAdded)
                         return; // do nothing when uploading non-harmful changes.