diff options
| author | Nathan Lee <2431820-nathanal@users.noreply.gitlab.com> | 2019-11-15 06:05:03 +0000 |
|---|---|---|
| committer | Thomas Holder <thomas@thomas-holder.de> | 2019-11-17 20:12:45 +0000 |
| commit | 3770f600ffd3c6c5b8d8cf164b0d7a75f5ca5032 (patch) | |
| tree | 0ec88a1d3c9164c4d7a7a053fc2a5e80279c7a95 | |
| parent | Update cs.po (diff) | |
| download | inkscape-3770f600ffd3c6c5b8d8cf164b0d7a75f5ca5032.tar.gz inkscape-3770f600ffd3c6c5b8d8cf164b0d7a75f5ca5032.zip | |
Crashfix on deleting selected with spray tool
Fix https://gitlab.com/inkscape/inkscape/issues/496
| -rw-r--r-- | src/ui/tools/spray-tool.cpp | 7 |
1 files 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; } |