Merge pull request #197 from ZehMatt/fix-option-prefix2

Fix a regression that no longer warns if condition is manually defined

Author: mrexodia

src/project_parser.cpp

@@ -445,18 +445,19 @@ Project::Project(const Project *parent, const std::string &path, bool build) : p
             options.push_back(o);
 
             // Add a condition matching the option name
-            conditions.emplace(o.name, o.name);
+            if (!conditions.emplace(o.name, o.name).second) {
+                print_key_warning("Option '" + o.name + "' would create a condition '" + o.name + "' that already exists", o.name, value);
+            }
 
             // Add an implicit condition for the option
             auto ncondition = normalize(o.name);
             if (ncondition.find(nproject_prefix) == 0) {
                 ncondition = ncondition.substr(nproject_prefix.size());
             }
             if (!ncondition.empty() && ncondition != o.name) {
-                if (conditions.contains(ncondition)) {
+                if (!conditions.emplace(ncondition, o.name).second) {
                     print_key_warning("Option '" + o.name + "' would create a condition '" + ncondition + "' that already exists", o.name, value);
                 }
-                conditions.emplace(ncondition, o.name);
             }
         }
     }