Fixed: No Launcher Folder when Null Launcher Path Value in Test

Reloaded-Project · Feb 23, 2022 · 2fc2193 · 2fc2193
1 parent 09c8594
commit 2fc2193
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/source/Reloaded.Mod.Loader.IO/Config/LoaderConfig.cs b/source/Reloaded.Mod.Loader.IO/Config/LoaderConfig.cs
@@ -260,10 +260,15 @@ private string GetLauncherFolder()
         if (_launcherFolder != null)
             return _launcherFolder;
 
+        // Get launcher path.
+        var launcherPath = LauncherPath;
+        if (string.IsNullOrEmpty(LauncherPath))
+            launcherPath = Paths.CurrentProgramFolder;
+
         // Workaround for when non-launcher folder is used.
         // e.g. When using loader.
         var launcherFolder = NormalizePath(Paths.CurrentProgramFolder);
-        var launcherFolderFallback = NormalizePath(Path.GetDirectoryName(LauncherPath));
+        var launcherFolderFallback = NormalizePath(Path.GetDirectoryName(launcherPath));
         if (!launcherFolder.Equals(launcherFolderFallback, StringComparison.OrdinalIgnoreCase))
             launcherFolder = launcherFolderFallback;