Ticket #7032: workaround7032.2.diff

src/org/openstreetmap/josm/actions/mapmode/DrawAction.java

@@ -1172 +1172 @@
         return rv;
     }
 
+    public Collection<OsmPrimitive> getSelected() {
+        DataSet ds = getCurrentDataSet();
+        if (ds == null) return null;
+        if (currentBaseNode != null && !ds.getSelected().isEmpty()) {
+            Way continueFrom = getWayForNode(currentBaseNode);
+            if (alt && continueFrom != null) {
+                return Collections.<OsmPrimitive>singleton(continueFrom);
+            }
+        }
+        return ds.getSelected();
+    }
+
     @Override
     public boolean layerIsSupported(Layer l) {
         return l instanceof OsmDataLayer;

src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java

@@ -73 +73 @@
 
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.JosmAction;
+import org.openstreetmap.josm.actions.mapmode.DrawAction;
 import org.openstreetmap.josm.actions.search.SearchAction.SearchMode;
 import org.openstreetmap.josm.actions.search.SearchAction.SearchSetting;
 import org.openstreetmap.josm.command.ChangeCommand;
@@ -461 +462 @@
      * to the dataset, of course).
      */
     void add() {
-        DataSet ds = Main.main.getCurrentDataSet();
-        if (ds == null) return;
-        Collection<OsmPrimitive> sel = ds.getSelected();
+        Collection<OsmPrimitive> sel;
+        if (Main.map.mapMode instanceof DrawAction) {
+            sel = ((DrawAction) Main.map.mapMode).getSelected();
+        } else {
+            DataSet ds = Main.main.getCurrentDataSet();
+            if (ds == null) return;
+            sel = ds.getSelected();
+        }
         if (sel.isEmpty()) return;
 
         JPanel p = new JPanel(new BorderLayout());