From 3770f600ffd3c6c5b8d8cf164b0d7a75f5ca5032 Mon Sep 17 00:00:00 2001
From: Nathan Lee <2431820-nathanal@users.noreply.gitlab.com>
Date: Fri, 15 Nov 2019 17:05:03 +1100
Subject: Crashfix on deleting selected with spray tool

Fix https://gitlab.com/inkscape/inkscape/issues/496
---
 src/ui/tools/spray-tool.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/ui/tools/spray-tool.cpp b/src/ui/tools/spray-tool.cpp
index c8dce3986..52a8d114d 100644
--- a/src/ui/tools/spray-tool.cpp
+++ b/src/ui/tools/spray-tool.cpp
@@ -1254,9 +1254,7 @@ bool SprayTool::root_handler(GdkEvent* event) {
                     desktop->getSelection()->clear();
                 }
 
-                if(this->is_dilating && event->button.button == 1 && !this->space_panning) {
-                    sp_spray_dilate(this, motion_w, desktop->dt2doc(motion_dt), Geom::Point(0,0), MOD__SHIFT(event));
-                }
+                sp_spray_dilate(this, motion_w, this->last_push, Geom::Point(0,0), MOD__SHIFT(event));
 
                 this->has_dilated = true;
                 ret = TRUE;
@@ -1363,13 +1361,14 @@ bool SprayTool::root_handler(GdkEvent* event) {
                                            SP_VERB_CONTEXT_SPRAY, _("Spray with clones"));
                         break;
                     case SPRAY_MODE_SINGLE_PATH:
-                        objectSet()->pathUnion(true);
+                        object_set.pathUnion(true);
                         desktop->getSelection()->add(object_set.objects().begin(), object_set.objects().end());
                         DocumentUndo::done(this->desktop->getDocument(),
                                            SP_VERB_CONTEXT_SPRAY, _("Spray in single path"));
                         break;
                 }
             }
+            object_set.clear();
             break;
         }
 
-- 
cgit v1.2.3