Fix lp:1670688.

Fixed bugs:
  - https://launchpad.net/bugs/1670688

(bzr r15577.1.1)

1 files changed, 10 insertions, 6 deletions

diff --git a/src/desktop.cpp b/src/desktop.cpp
index 2476b10bb..a5bf99e55 100644
--- a/src/desktop.cpp
+++ b/src/desktop.cpp
@@ -1531,12 +1531,16 @@ SPDesktop::setDocument (SPDocument *doc)
     layers->setDocument(doc);
     selection->setDocument(doc);
 
-	// remove old EventLog if it exists (see also: bug #1071082)
-	if (event_log) {
-		doc->removeUndoObserver(*event_log);
-		delete event_log;
-		event_log = 0;
-	}
+    if (event_log) {
+        // Remove it from the replaced document. This prevents Inkscape from
+        // crashing since we access it in the replaced document's destructor
+        // which results in an undefined behavior. (See also: bug #1670688)
+        if (this->doc()) {
+            this->doc()->removeUndoObserver(*event_log);
+        }
+        delete event_log;
+        event_log = 0;
+    }
 
     /* setup EventLog */
     event_log = new Inkscape::EventLog(doc);