From 2ebc7ad774aa6fd19c684464e35ce9129f8ae341 Mon Sep 17 00:00:00 2001 From: Jabiertxo Arraiza Cenoz Date: Thu, 28 Dec 2017 19:44:25 +0100 Subject: Add improvements sugested by Eduard Brawn And Moini --- src/splivarot.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'src/splivarot.cpp') diff --git a/src/splivarot.cpp b/src/splivarot.cpp index f6544872f..40a2a8993 100644 --- a/src/splivarot.cpp +++ b/src/splivarot.cpp @@ -310,7 +310,7 @@ Geom::PathVector pathliv_to_pathvector(Path *pathliv){ // take the source paths from the file, do the operation, delete the originals and add the results BoolOpErrors Inkscape::ObjectSet::pathBoolOp(bool_op bop, const bool skip_undo, const unsigned int verb, const Glib::ustring description) { - if (nullptr != desktop() && !skip_undo) { + if (nullptr != desktop()) { SPDocument *doc = desktop()->getDocument(); BoolOpErrors returnCode = ObjectSet::pathBoolOp(bop, true); switch(returnCode) { @@ -327,10 +327,14 @@ BoolOpErrors Inkscape::ObjectSet::pathBoolOp(bool_op bop, const bool skip_undo, boolop_display_error_message(desktop(), _("Unable to determine the z-order of the objects selected for difference, XOR, division, or path cut.")); break; case DONE_NO_PATH: - DocumentUndo::done(doc, SP_VERB_NONE, description); + if (!skip_undo) { + DocumentUndo::done(doc, SP_VERB_NONE, description); + } break; case DONE: - DocumentUndo::done(doc, verb, description); + if (!skip_undo) { + DocumentUndo::done(doc, verb, description); + } break; } return returnCode; -- cgit v1.2.3