diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2013-03-19 09:40:14 +0000 |
|---|---|---|
| committer | Jabiertxo Arraiza Zenotz <jtx@jtx.marker.es> | 2013-03-19 09:40:14 +0000 |
| commit | c4e1a7bcf2ac28b1894cae7c6b11546381236889 (patch) | |
| tree | b1a9ebd2973a669bec695ebfeb27a8f8f6cd7b95 /src/desktop.cpp | |
| parent | Widgets to effect added (diff) | |
| parent | Keys. Bug #253552 (Repeat effect shortcut). (diff) | |
| download | inkscape-c4e1a7bcf2ac28b1894cae7c6b11546381236889.tar.gz inkscape-c4e1a7bcf2ac28b1894cae7c6b11546381236889.zip | |
Merge from trunk
(bzr r11950.1.60)
Diffstat (limited to 'src/desktop.cpp')
| -rw-r--r-- | src/desktop.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/desktop.cpp b/src/desktop.cpp index c7a763ae1..d74e8fdad 100644 --- a/src/desktop.cpp +++ b/src/desktop.cpp @@ -1582,6 +1582,13 @@ SPDesktop::setDocument (SPDocument *doc) _layer_hierarchy->connectChanged(sigc::bind(sigc::ptr_fun(_layer_hierarchy_changed), this)); _layer_hierarchy->setTop(doc->getRoot()); + // remove old EventLog if it exists (see also: bug #1071082) + if (event_log) { + doc->removeUndoObserver(*event_log); + delete event_log; + event_log = 0; + } + /* setup EventLog */ event_log = new Inkscape::EventLog(doc); doc->addUndoObserver(*event_log); |