diff options
| author | Jabiertxof <jtx@jtx> | 2017-01-24 00:02:46 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx> | 2017-01-24 00:02:46 +0000 |
| commit | e06fb0c25cc352df40b77a1988b5045426e7ef2d (patch) | |
| tree | dd40be94ed5d56afdce3f4535a559d8d4741dd05 /src/document-undo.cpp | |
| parent | Add fixes sugested by Martin Owens (diff) | |
| download | inkscape-e06fb0c25cc352df40b77a1988b5045426e7ef2d.tar.gz inkscape-e06fb0c25cc352df40b77a1988b5045426e7ef2d.zip | |
Fixing to merge
(bzr r15392.1.8)
Diffstat (limited to 'src/document-undo.cpp')
| -rw-r--r-- | src/document-undo.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/document-undo.cpp b/src/document-undo.cpp index 9c534dd58..113d09d66 100644 --- a/src/document-undo.cpp +++ b/src/document-undo.cpp @@ -160,6 +160,7 @@ void Inkscape::DocumentUndo::maybeDone(SPDocument *doc, const gchar *key, const sp_repr_begin_transaction (doc->rdoc); return; } + if (key && !doc->actionkey.empty() && (doc->actionkey == key) && !doc->priv->undo.empty()) { (doc->priv->undo.back())->event = sp_repr_coalesce_log ((doc->priv->undo.back())->event, log); @@ -169,6 +170,7 @@ void Inkscape::DocumentUndo::maybeDone(SPDocument *doc, const gchar *key, const doc->priv->history_size++; doc->priv->undoStackObservers.notifyUndoCommitEvent(event); } + if ( key ) { doc->actionkey = key; } else { @@ -179,6 +181,7 @@ void Inkscape::DocumentUndo::maybeDone(SPDocument *doc, const gchar *key, const doc->setModifiedSinceSave(); sp_repr_begin_transaction (doc->rdoc); + doc->priv->commit_signal.emit(); } |