Fix Settings::remove() always returning true

kahrl · kahrl · commit b67eab3b0050 · 2016-01-19T10:15:01.000+01:00
diff --git a/src/settings.cpp b/src/settings.cpp
@@ -880,8 +880,14 @@ bool Settings::remove(const std::string &name)
 {
 	MutexAutoLock lock(m_mutex);
 
-	delete m_settings[name].group;
-	return m_settings.erase(name);
+	std::map<std::string, SettingsEntry>::iterator it = m_settings.find(name);
+	if (it != m_settings.end()) {
+		delete it->second.group;
+		m_settings.erase(it);
+		return true;
+	} else {
+		return false;
+	}
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -880,8 +880,14 @@ bool Settings::remove(const std::string &name)`
`880`	`880`	`{`
`881`	`881`	`MutexAutoLock lock(m_mutex);`
`882`	`882`
`883`		`- delete m_settings[name].group;`
`884`		`- return m_settings.erase(name);`
	`883`	`+ std::map<std::string, SettingsEntry>::iterator it = m_settings.find(name);`
	`884`	`+ if (it != m_settings.end()) {`
	`885`	`+ delete it->second.group;`
	`886`	`+ m_settings.erase(it);`
	`887`	`+ return true;`
	`888`	`+ } else {`
	`889`	`+ return false;`
	`890`	`+ }`
`885`	`891`	`}`
`886`	`892`
`887`	`893`