Changeset 14170 in josm


Ignore:
Timestamp:
2018-08-20T00:02:11+02:00 (5 weeks ago)
Author:
Don-vip
Message:

fix #16542 - don't display error dialog when notes upload is canceled

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/actions/upload/UploadNotesTask.java

    r12635 r14170  
    1818import org.openstreetmap.josm.gui.progress.ProgressMonitor;
    1919import org.openstreetmap.josm.io.OsmApi;
     20import org.openstreetmap.josm.io.OsmTransferCanceledException;
    2021import org.openstreetmap.josm.io.OsmTransferException;
    2122import org.openstreetmap.josm.tools.Logging;
     
    109110                Logging.error("Failed to upload note to server: {0}", note.getId());
    110111                Logging.error(e);
    111                 failedNotes.put(note, e);
     112                if (!(e instanceof OsmTransferCanceledException)) {
     113                    failedNotes.put(note, e);
     114                }
    112115            }
    113116        }
Note: See TracChangeset for help on using the changeset viewer.