[josm] 01/02: Add patch to fix 'Update multipolygon' action.

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository josm.

commit 98f3943fb96ac1f3e3bf9dd5606cc8bacc663284
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Nov 1 20:03:24 2017 +0100

    Add patch to fix 'Update multipolygon' action.
---
 debian/changelog                                   |  6 ++++++
 debian/patches/series                              |  1 +
 ...pdate-multipolygon-action-no-longer-works.patch | 23 ++++++++++++++++++++++
 3 files changed, 30 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 5333b50..d69ad47 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+josm (0.0.svn13053+dfsg-2) UNRELEASED; urgency=medium
+
+  * Add patch to fix 'Update multipolygon' action.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Wed, 01 Nov 2017 20:03:21 +0100
+
 josm (0.0.svn13053+dfsg-1) unstable; urgency=medium
 
   * New tested snapshot.
diff --git a/debian/patches/series b/debian/patches/series
index 0e16b21..ec5b5cb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@
 06-move_data_out_of_jar.patch
 07-use_system_fonts.patch
 08-use_noto_font.patch
+svn-r13067-Update-multipolygon-action-no-longer-works.patch
diff --git a/debian/patches/svn-r13067-Update-multipolygon-action-no-longer-works.patch b/debian/patches/svn-r13067-Update-multipolygon-action-no-longer-works.patch
new file mode 100644
index 0000000..72e2226
--- /dev/null
+++ b/debian/patches/svn-r13067-Update-multipolygon-action-no-longer-works.patch
@@ -0,0 +1,23 @@
+Description: fix #15507 - Update multipolygon action no longer works (regression from r12726)
+Author: Don-vip
+Origin: https://josm.openstreetmap.de/changeset/13067/josm
+Bug: https://josm.openstreetmap.de/ticket/15507
+
+--- a/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java
++++ b/src/org/openstreetmap/josm/actions/CreateMultipolygonAction.java
+@@ -449,8 +449,13 @@ public class CreateMultipolygonAction ex
+                     fixed = true;
+                 }
+             }
+-            if (fixed && !relation.isNew())
+-                commands.add(new ChangeCommand(relation, r2));
++            if (fixed && !relation.isNew()) {
++                DataSet ds = relation.getDataSet();
++                if (ds == null) {
++                    ds = MainApplication.getLayerManager().getEditDataSet();
++                }
++                commands.add(new ChangeCommand(ds, relation, r2));
++            }
+         }
+ 
+         return commands;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm.git