diff options
| author | Marc Jeanmougin <marc@jeanmougin.fr> | 2015-12-13 22:57:10 +0000 |
|---|---|---|
| committer | Marc Jeanmougin <marcjeanmougin@free.fr> | 2015-12-13 22:57:10 +0000 |
| commit | 743c2ecacf5abf06b43ce05f8107e6f00230c942 (patch) | |
| tree | 0d741ce0a2b2242550560410b532dd2dc8d06768 /src/layer-manager.cpp | |
| parent | cppification and performance (diff) | |
| download | inkscape-743c2ecacf5abf06b43ce05f8107e6f00230c942.tar.gz inkscape-743c2ecacf5abf06b43ce05f8107e6f00230c942.zip | |
fix minor bug from recent merge: layer names were incorrectly created
(bzr r14530)
Diffstat (limited to 'src/layer-manager.cpp')
| -rw-r--r-- | src/layer-manager.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/layer-manager.cpp b/src/layer-manager.cpp index 5dae5f20a..c0fe95dd7 100644 --- a/src/layer-manager.cpp +++ b/src/layer-manager.cpp @@ -194,9 +194,10 @@ Glib::ustring LayerManager::getNextLayerName( SPObject* obj, gchar const *label) std::set<SPObject *> layers = _document->getResourceList("layer"); SPObject *root=_desktop->currentRoot(); if ( root ) { - std::set<SPObject *>::iterator iter = layers.find(obj); - if (iter != layers.end()) + for (std::set<SPObject *>::const_iterator iter = layers.begin(); iter != layers.end(); ++iter) { + if (*iter != obj) currentNames.insert( (*iter)->label() ? Glib::ustring((*iter)->label()) : Glib::ustring() ); + } } // Not sure if we need to cap it, but we'll just be paranoid for the moment |