selection clear: First disconnect, then clear

As proposed by Marc, the objects are first disconnected and then
all elements are removed from the container via container.clear.
This also avoids the corruption of the iterator as the container
is not modified during the iterations.

1 files changed, 3 insertions, 5 deletions

diff --git a/src/object-set.cpp b/src/object-set.cpp
index 55da22bdf..36ddac350 100644
--- a/src/object-set.cpp
+++ b/src/object-set.cpp
@@ -124,11 +124,9 @@ void ObjectSet::_add(SPObject *object) {
 }
 
 void ObjectSet::_clear() {
-    MultiIndexContainer::iterator it = _container.begin();
-    while (it != _container.end()){
-        _disconnect(*it);
-        it = _container.erase(it);
-    }
+    for (auto object: _container)
+        _disconnect(object);
+    _container.clear();
 }
 
 SPObject *ObjectSet::_getMutualAncestor(SPObject *object) {