From 4002d292bbb499304af30bc060ce0200481062b8 Mon Sep 17 00:00:00 2001
From: Nicolas Dufour <nicoduf@yahoo.fr>
Date: Tue, 19 Mar 2013 08:01:10 +0100
Subject: Partial fix for Bug #1071082 (Undo History doesn't work if open
 before file is opened) by vaifrax.

(bzr r12225)
---
 src/event-log.cpp | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'src/event-log.cpp')

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) 
-- 
cgit v1.2.3