Miscellaneous fixes

gta-chaos-mod · Feb 11, 2025 · da5979a · da5979a
1 parent e767262
commit da5979a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/ChaosMod/Util/OptionsFile.h b/ChaosMod/Util/OptionsFile.h
@@ -19,7 +19,7 @@ class OptionsFile
 
   public:
 	OptionsFile(const char *fileName, std::vector<const char *> compatFileNames = {})
-	    : m_FileName(fileName), m_FoundFileName(""), m_CompatFileNames(compatFileNames)
+	    : m_FileName(fileName), m_FoundFileName(fileName), m_CompatFileNames(compatFileNames)
 	{
 		Reset();
 	}
@@ -73,7 +73,7 @@ class OptionsFile
 		std::ofstream file(m_FoundFileName, std::ofstream::out | std::ofstream::trunc);
 		if (!file)
 		{
-			LOG("Couldn't write config file " << m_FileName);
+			LOG("Couldn't write config file " << m_FoundFileName);
 			return;
 		}
 		for (auto &[key, value] : m_Options)

diff --git a/ConfigApp/Workshop/WorkshopEditDialog.xaml.cs b/ConfigApp/Workshop/WorkshopEditDialog.xaml.cs
@@ -137,7 +137,7 @@ string handleEffectId(string itemName)
                     if (file.Type == WorkshopSubmissionFileType.Sound)
                     {
                         var effectId = itemName;
-                        if (!Effects.EffectsMap.ContainsKey(effectId))
+                        if (!Effects.EffectsMap.ContainsKey(effectId) && itemName.Length > 4)
                             effectId = itemName[..^4];
                         if (Effects.EffectsMap.ContainsKey(effectId))
                             itemName += $" ({Effects.EffectsMap[effectId].Name})";

diff --git a/ConfigApp/Workshop/WorkshopSubmissionItem.cs b/ConfigApp/Workshop/WorkshopSubmissionItem.cs
@@ -156,7 +156,7 @@ public void UpdateSearchTerms()
                     {
                         foreach (var line in File.ReadAllLines(m_FileHandler.SubmissionDirectory + file.Name))
                         {
-                            var match = Regex.Match(line, @"(?:Name|ScriptId)\s*=\s*""((?:\\""|[^""])+)""");
+                            var match = Regex.Match(line, @"(?:Name|ScriptId|EffectId)\s*=\s*""((?:\\""|[^""])+)""");
                             if (match.Success)
                             {
                                 SearchTerms.Add(new(match.Groups[1].Value, file.Name));