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/event-log.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/event-log.cpp')
| -rw-r--r-- | src/event-log.cpp | 13 |
1 files changed, 12 insertions, 1 deletions
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) |