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 | |
| 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')
| -rw-r--r-- | src/desktop.cpp | 7 | ||||
| -rw-r--r-- | src/event-log.cpp | 13 |
2 files changed, 19 insertions, 1 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); diff --git a/src/event-log.cpp b/src/event-log.cpp index e2528ce0b..9304f68c5 100644 --- a/src/event-log.cpp +++ b/src/event-log.cpp @@ -38,7 +38,18 @@ EventLog::EventLog(SPDocument* document) : curr_row[_columns.type] = SP_VERB_FILE_NEW; } -EventLog::~EventLog() { } +EventLog::~EventLog() { + // avoid crash by clearing entries here (see bug #1071082) + if (_connected) { + (*_callback_connections)[CALLB_SELECTION_CHANGE].block(); + (*_callback_connections)[CALLB_EXPAND].block(); + + _event_list_store->clear(); + + (*_callback_connections)[CALLB_EXPAND].block(false); + (*_callback_connections)[CALLB_SELECTION_CHANGE].block(false); + } +} void EventLog::notifyUndoEvent(Event* log) |