From 77b3c4eb00a8f297449deb5af29f566a12c03b2e Mon Sep 17 00:00:00 2001 From: Martin Owens Date: Sat, 19 Apr 2014 20:36:33 -0400 Subject: Stop observer from crashing when it doesn't exist in preferences.xml (bzr r13293) --- src/desktop.cpp | 1 - src/preferences.cpp | 4 +++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/desktop.cpp b/src/desktop.cpp index 3ed6d9ef3..f14a314b9 100644 --- a/src/desktop.cpp +++ b/src/desktop.cpp @@ -138,7 +138,6 @@ SPDesktop::SPDesktop() : _w2d(), _d2w(), _doc2dt( Geom::Scale(1, -1) ), - // This doesn't work I don't know why. _image_render_observer(this, "/options/rendering/imageinoutlinemode"), grids_visible( false ) { diff --git a/src/preferences.cpp b/src/preferences.cpp index 2fec3b307..d0c3783b5 100644 --- a/src/preferences.cpp +++ b/src/preferences.cpp @@ -581,6 +581,8 @@ XML::Node *Preferences::_findObserverNode(Glib::ustring const &pref_path, Glib:: // find the node corresponding to the "directory". Inkscape::XML::Node *node = _getNode(node_key, create), *child; + if (!node) return node; + for (child = node->firstChild(); child; child = child->next()) { // If there is a node with id corresponding to the attr key, // this means that the last part of the path is actually a key (folder). @@ -601,7 +603,7 @@ void Preferences::addObserver(Observer &o) if ( _observer_map.find(&o) == _observer_map.end() ) { Glib::ustring node_key, attr_key; Inkscape::XML::Node *node; - node = _findObserverNode(o.observed_path, node_key, attr_key, false); + node = _findObserverNode(o.observed_path, node_key, attr_key, true); if (node) { // set additional data if (o._data) { -- cgit v1.2.3