ConfigMonitor: Properly combine erase and iteration

Otherwise we skip the item right after the removed element

ConfigMonitor: Properly combine erase and iteration
Otherwise we skip the item right after the removed element
2df014f5 · Aleix Pol Gonzalez · Aleix Pol Gonzalez · 2c1e09a9 · 2df014f5
Commit 2df014f5 authored Oct 23, 2020 by Aleix Pol Gonzalez 🐧 Committed by Aleix Pol Gonzalez Oct 29, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

src/configmonitor.cpp src/configmonitor.cpp +3 -1

No files found.
--- a/src/configmonitor.cpp
+++ b/src/configmonitor.cpp
@@ -184,10 +184,12 @@ void ConfigMonitor::Private::updateConfigs(const KScreen::ConfigPtr &newConfig)

 void ConfigMonitor::Private::configDestroyed(QObject *removedConfig)
 {
-    for (auto iter = watchedConfigs.begin(); iter != watchedConfigs.end(); ++iter) {
+    for (auto iter = watchedConfigs.begin(); iter != watchedConfigs.end(); ) {
        if (iter->toStrongRef() == removedConfig) {
            iter = watchedConfigs.erase(iter);
            // Iterate over the entire list in case there are duplicates
+        } else {
+            ++iter;
        }
    }
 }