2
0
Эх сурвалжийг харах

- new mods (not mentioned in modSettings.json) will be enabled by
default

Ivan Savenko 11 жил өмнө
parent
commit
27be6a8f13

+ 10 - 3
launcher/modManager/cmodlist.cpp

@@ -158,10 +158,17 @@ CModEntry CModList::getMod(QString modname) const
 	QVariantMap settings;
 
 	QVariant conf = modSettings[modname];
-	if (conf.canConvert<QVariantMap>())
-		settings = modSettings[modname].toMap();
+	if (conf.isNull())
+	{
+		settings["active"] = true; // default
+	}
 	else
-		settings.insert("active", conf);
+	{
+		if (conf.canConvert<QVariantMap>())
+			settings = modSettings[modname].toMap();
+		else
+			settings.insert("active", conf);
+	}
 
 	for (auto entry : repositories)
 	{

+ 1 - 1
lib/CModHandler.cpp

@@ -603,7 +603,7 @@ void CModInfo::loadLocalData(const JsonNode & data)
 	{
 		enabled = data.Bool();
 	}
-	else
+	if (data.getType() == JsonNode::DATA_STRUCT)
 	{
 		enabled   = data["active"].Bool();
 		validated = data["validated"].Bool();