From 6d1e74a4fb98c9bee48d2c772d065f297110f403 Mon Sep 17 00:00:00 2001 From: cadaei Date: Wed, 29 Apr 2020 17:22:05 +0200 Subject: [PATCH] file not found fix --- ARKBreedingStats.sln.DotSettings | 1 + ARKBreedingStats/Form1.cs | 7 ++++--- ARKBreedingStats/Properties/AssemblyInfo.cs | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/ARKBreedingStats.sln.DotSettings b/ARKBreedingStats.sln.DotSettings index f49271e2..9c5189be 100644 --- a/ARKBreedingStats.sln.DotSettings +++ b/ARKBreedingStats.sln.DotSettings @@ -14,4 +14,5 @@ NEXT_LINE True True + True True \ No newline at end of file diff --git a/ARKBreedingStats/Form1.cs b/ARKBreedingStats/Form1.cs index 6a66cdc1..fac5b75d 100644 --- a/ARKBreedingStats/Form1.cs +++ b/ARKBreedingStats/Form1.cs @@ -3345,10 +3345,11 @@ private void openJsonDataFolderToolStripMenuItem_Click(object sender, EventArgs private void ReloadNamePatternCustomReplacings(PatternEditor pe = null) { string filePath = FileService.GetJsonPath(FileService.CustomReplacingsNamePattern); - if (!FileService.LoadJSONFile(filePath, out customReplacingsNamingPattern, out string error)) + string errorMessage = null; + if (!File.Exists(filePath) || !FileService.LoadJSONFile(filePath, out customReplacingsNamingPattern, out errorMessage)) { - if (!string.IsNullOrEmpty(error)) - MessageBox.Show(error, "ASB Custom replacings file loading error", MessageBoxButtons.OK, MessageBoxIcon.Error); + if (!string.IsNullOrEmpty(errorMessage)) + MessageBox.Show(errorMessage, "ASB Custom replacings file loading error", MessageBoxButtons.OK, MessageBoxIcon.Error); } else if (pe != null) pe.SetCustomReplacings(customReplacingsNamingPattern); } diff --git a/ARKBreedingStats/Properties/AssemblyInfo.cs b/ARKBreedingStats/Properties/AssemblyInfo.cs index 8f0cfed7..eea595cb 100644 --- a/ARKBreedingStats/Properties/AssemblyInfo.cs +++ b/ARKBreedingStats/Properties/AssemblyInfo.cs @@ -30,6 +30,6 @@ // Revision // [assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("0.39.5.0")] +[assembly: AssemblyFileVersion("0.39.5.1")] [assembly: NeutralResourcesLanguage("en")]