Changeset 15430 in josm for trunk

Timestamp:

2019-10-06T14:41:30+02:00 (5 years ago)

Author:

Don-vip

Message:

fix #5633 - proper cancel of "close open changesets" action

File:

• trunk/src/org/openstreetmap/josm/actions/CloseChangesetAction.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/actions/CloseChangesetAction.java

@@ -28 +28 @@
 import org.openstreetmap.josm.io.OsmServerChangesetReader;
 import org.openstreetmap.josm.io.OsmServerUserInfoReader;
+import org.openstreetmap.josm.io.OsmTransferCanceledException;
 import org.openstreetmap.josm.io.OsmTransferException;
+import org.openstreetmap.josm.tools.Logging;
 import org.openstreetmap.josm.tools.Shortcut;
 import org.xml.sax.SAXException;
@@ -140 +142 @@
                         getProgressMonitor().createSubTaskMonitor(1, false /* not internal */)
                 );
+            } catch (OsmTransferCanceledException e) {
+                Logging.trace(e);
+                cancel();
             } catch (OsmTransferException | IllegalArgumentException e) {
                 if (canceled)