diff options
| author | su_v <suv-sf@users.sourceforge.net> | 2013-03-21 14:21:33 +0000 |
|---|---|---|
| committer | ~suv <suv-sf@users.sourceforge.net> | 2013-03-21 14:21:33 +0000 |
| commit | 6e4dd17bb7c17023c12ffb4a5e8bac62fc9d5e7d (patch) | |
| tree | 0d9b47f006038fcb0f9635af413b2194445cce05 /src/desktop.cpp | |
| parent | 988601-changes_2013_03_20a.patch (diff) | |
| parent | Clarified choice of downsampling routine. (diff) | |
| download | inkscape-6e4dd17bb7c17023c12ffb4a5e8bac62fc9d5e7d.tar.gz inkscape-6e4dd17bb7c17023c12ffb4a5e8bac62fc9d5e7d.zip | |
merge from trunk (r1228)
(bzr r11668.1.63)
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); |