From 743c2ecacf5abf06b43ce05f8107e6f00230c942 Mon Sep 17 00:00:00 2001 From: Marc Jeanmougin Date: Sun, 13 Dec 2015 23:57:10 +0100 Subject: fix minor bug from recent merge: layer names were incorrectly created (bzr r14530) --- src/layer-manager.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/layer-manager.cpp') 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 layers = _document->getResourceList("layer"); SPObject *root=_desktop->currentRoot(); if ( root ) { - std::set::iterator iter = layers.find(obj); - if (iter != layers.end()) + for (std::set::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 -- cgit v1.2.3