Changeset 35705 in osm for applications

Timestamp:

2021-02-08T10:03:07+01:00 (4 years ago)

Author:

GerdP

Message:

fix #19936 CommandLine plugin (circle, arc) frequently crashes JOSM

• remove code which tries to switch back to previous map mode

File:

• applications/editors/josm/plugins/CommandLine/src/org/openstreetmap/josm/plugins/commandline/CommandLine.java (modified) (3 diffs)

applications/editors/josm/plugins/CommandLine/src/org/openstreetmap/josm/plugins/commandline/CommandLine.java

@@ -75 +75 @@
     protected History history;
     protected MapFrame currentMapFrame;
-    protected MapMode previousMode;
 
     static final String pluginDir = Preferences.main().getPluginsDirectory().getAbsolutePath() + "/CommandLine/";
@@ -113 +112 @@
         currentCommand.resetLoading();
         parseSelection(ds.getSelected());
-        if (!(map.mapMode instanceof AnyAction
-           || map.mapMode instanceof DummyAction
-           || map.mapMode instanceof LengthAction
-           || map.mapMode instanceof NodeAction
-           || map.mapMode instanceof PointAction
-           || map.mapMode instanceof RelationAction
-           || map.mapMode instanceof WayAction)) {
-            previousMode = map.mapMode;
-        }
         if (currentCommand.currentParameterNum < currentCommand.parameters.size())
             setMode(Mode.SELECTION);
@@ -331 +321 @@
     public void endInput() {
         setMode(Mode.IDLE);
-        MainApplication.getMap().selectMapMode(previousMode);
+        MainApplication.getMap().selectMapMode(null);
         MainApplication.getMap().mapView.repaint();
     }