only display error message and not unhandled exception if values file…

… couldn't be loaded (#1331)
cadon · Feb 17, 2024 · 96aca7b · 96aca7b
1 parent 42b0684
commit 96aca7b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/ARKBreedingStats/FileService.cs b/ARKBreedingStats/FileService.cs
@@ -118,7 +118,7 @@ public static bool LoadJsonFile<T>(string filePath, out T data, out string error
                     if (data != null)
                         return true;
 
-                    errorMessage = $"File\n{Path.GetFullPath(filePath)}\n contains no readable data.";
+                    errorMessage = $"File\n{Path.GetFullPath(filePath)}\ncontains no readable data.";
                     return false;
                 }
             }

diff --git a/ARKBreedingStats/values/ValuesFile.cs b/ARKBreedingStats/values/ValuesFile.cs
@@ -136,6 +136,12 @@ protected static bool TryLoadValuesFile(string filePath, bool setModFileName, bo
                 if (throwExceptionOnFail)
                     throw new FormatException(errorMessage);
             }
+            catch (FileLoadException ex)
+            {
+                errorMessage = ex.Message;
+                if (throwExceptionOnFail)
+                    throw;
+            }
             return false;
         }
     }