mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-27 15:32:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

configfile: set the modified flag correctly on set*Vector methods

Browse Source
This commit is contained in:
Stefan Seyfried
2013-02-23 15:34:47 +01:00
committed by Jacek Jendrzej
parent a410dabcdb
commit 07a8027b4d
1 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
lib/libconfigfile/configfile.cpp
View File

@@ -387,6 +387,9 @@ void CConfigFile::setString(const std::string & key, const std::string & val)
void CConfigFile::setInt32Vector(const std::string & key, const std::vector<int32_t> vec) void CConfigFile::setInt32Vector(const std::string & key, const std::vector<int32_t> vec)
{ {
bool tmpUnknownKeyQueryedFlag = unknownKeyQueryedFlag;
unknownKeyQueryedFlag = false;
std::string oldVal = getString(key);
std::stringstream s; std::stringstream s;
for (std::vector<int32_t>::const_iterator it = vec.begin(); ; ) for (std::vector<int32_t>::const_iterator it = vec.begin(); ; )
@@ -399,21 +402,35 @@ void CConfigFile::setInt32Vector(const std::string & key, const std::vector<int3
break; break;
s << delimiter; s << delimiter;
} }
s >> configData[key]; if (oldVal != s.str() || unknownKeyQueryedFlag)
{
modifiedFlag = true;
configData[key] = s.str();
}
unknownKeyQueryedFlag = tmpUnknownKeyQueryedFlag;
} }
void CConfigFile::setStringVector(const std::string & key, const std::vector<std::string> vec) void CConfigFile::setStringVector(const std::string & key, const std::vector<std::string> vec)
{ {
configData[key] = ""; bool tmpUnknownKeyQueryedFlag = unknownKeyQueryedFlag;
unknownKeyQueryedFlag = false;
std::string oldVal = getString(key);
std::string newVal = "";
for (std::vector<std::string>::const_iterator it = vec.begin(); ; ) for (std::vector<std::string>::const_iterator it = vec.begin(); ; )
{ {
if (it == vec.end()) if (it == vec.end())
break; break;
configData[key] += *it; newVal += *it;
++it; ++it;
if (it == vec.end()) if (it == vec.end())
break; break;
configData[key] += delimiter; newVal += delimiter;
} }
if (oldVal != newVal || unknownKeyQueryedFlag)
{
modifiedFlag = true;
configData[key] = newVal;
}
unknownKeyQueryedFlag = tmpUnknownKeyQueryedFlag;
} }