mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

Change the check for duplicate keys when writing the options file to an assertion as it can't actually happen

Browse source 
Originally committed to SVN as r6013.
This commit is contained in:
Thomas Goyne 2011-12-22 21:11:38 +00:00
parent 4823706206
commit 56165305a4
1 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
aegisub/libaegisub/common/option.cpp
View file

@ -207,12 +207,7 @@ void Options::Flush() {
bool Options::PutOption(json::Object &obj, const std::string &path, const json::UnknownElement &value) { bool Options::PutOption(json::Object &obj, const std::string &path, const json::UnknownElement &value) {
// Having a '/' denotes it is a leaf. // Having a '/' denotes it is a leaf.
if (path.find('/') == std::string::npos) { if (path.find('/') == std::string::npos) {
json::Object::iterator pos = obj.find(path); assert(obj.find(path) == obj.end());
// Fail if a key of the same name already exists.
if (pos != obj.end())
throw OptionErrorDuplicateKey("Key already exists");
obj[path] = value; obj[path] = value;
return true; return true;
} else { } else {