diff options
| author | Jabiertxo Arraiza Cenoz <jtx@jtx-desktop.markerlab.es> | 2017-12-28 18:44:25 +0000 |
|---|---|---|
| committer | Jabiertxo Arraiza Cenoz <jtx@jtx-desktop.markerlab.es> | 2017-12-28 18:44:25 +0000 |
| commit | 2ebc7ad774aa6fd19c684464e35ce9129f8ae341 (patch) | |
| tree | c09257feacfe2fe0a5bf57b65e1d2e751ade0318 /src/splivarot.cpp | |
| parent | Stop using deprecated gtk_adjustment_value_changed (diff) | |
| download | inkscape-2ebc7ad774aa6fd19c684464e35ce9129f8ae341.tar.gz inkscape-2ebc7ad774aa6fd19c684464e35ce9129f8ae341.zip | |
Add improvements sugested by Eduard Brawn And Moini
Diffstat (limited to 'src/splivarot.cpp')
| -rw-r--r-- | src/splivarot.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
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 <b>z-order</b> 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; |