diff options
| author | Liam P. White <inkscapebronyat-signgmaildotcom> | 2014-04-21 18:48:57 +0000 |
|---|---|---|
| committer | Liam P. White <inkscapebronyat-signgmaildotcom> | 2014-04-21 18:48:57 +0000 |
| commit | 28563e8b1322e33a43107bfedaae99f669b303f5 (patch) | |
| tree | b300f70aa463098de18a62ffa1bd93f9b6e3c6dd /src/preferences.cpp | |
| parent | correcting previous revision (diff) | |
| parent | ensure backwards compatibility with old hpgl exports (diff) | |
| download | inkscape-28563e8b1322e33a43107bfedaae99f669b303f5.tar.gz inkscape-28563e8b1322e33a43107bfedaae99f669b303f5.zip | |
Update to trunk
(bzr r13090.1.66)
Diffstat (limited to 'src/preferences.cpp')
| -rw-r--r-- | src/preferences.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
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) { |