diff options
| author | Marc Jeanmougin <marc@jeanmougin.fr> | 2016-11-12 09:54:56 +0000 |
|---|---|---|
| committer | Marc Jeanmougin <marcjeanmougin@free.fr> | 2016-11-12 09:54:56 +0000 |
| commit | a322f3bb70c6e4da49d2430a5c09c47ec8fbd2c0 (patch) | |
| tree | fa5b970da528fe7da23212dfe977bd149bb32b15 /src/widgets/stroke-style.cpp | |
| parent | Fix selection toolbar icons missing on start (diff) | |
| download | inkscape-a322f3bb70c6e4da49d2430a5c09c47ec8fbd2c0.tar.gz inkscape-a322f3bb70c6e4da49d2430a5c09c47ec8fbd2c0.zip | |
Fix rare crash on undo break apart
Fixed bugs:
- https://launchpad.net/bugs/1449276
(bzr r15241)
Diffstat (limited to 'src/widgets/stroke-style.cpp')
| -rw-r--r-- | src/widgets/stroke-style.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/widgets/stroke-style.cpp b/src/widgets/stroke-style.cpp index 81a8e8115..de3e98297 100644 --- a/src/widgets/stroke-style.cpp +++ b/src/widgets/stroke-style.cpp @@ -940,7 +940,7 @@ StrokeStyle::updateLine() SPStyle * const style = object->style; /* Markers */ - updateAllMarkers(objects); // FIXME: make this desktop query too + updateAllMarkers(objects, true); // FIXME: make this desktop query too /* Dash */ setDashSelectorFromStyle(dashSelector, style); // FIXME: make this desktop query too @@ -1192,7 +1192,7 @@ StrokeStyle::setPaintOrderButtons(Gtk::ToggleButton *active) * that marker. */ void -StrokeStyle::updateAllMarkers(std::vector<SPItem*> const &objects) +StrokeStyle::updateAllMarkers(std::vector<SPItem*> const &objects, bool skip_undo) { struct { MarkerComboBox *key; int loc; } const keyloc[] = { { startMarkerCombo, SP_MARKER_LOC_START }, @@ -1246,9 +1246,11 @@ StrokeStyle::updateAllMarkers(std::vector<SPItem*> const &objects) if (update) { setMarkerColor(marker, combo->get_loc(), SP_ITEM(object)); - SPDocument *document = desktop->getDocument(); - DocumentUndo::done(document, SP_VERB_DIALOG_FILL_STROKE, + if (!skip_undo) { + SPDocument *document = desktop->getDocument(); + DocumentUndo::maybeDone(document, "UaM", SP_VERB_DIALOG_FILL_STROKE, _("Set marker color")); + } } } else { |