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/desktop.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'src/desktop.cpp')

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