Protection against bad conversion output

Added a little more relisience to the conversion process.
coldino · Jan 22, 2018 · 22ff9f5 · 22ff9f5
1 parent 8da8bda
commit 22ff9f5
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/LarkatorGUI/ArkReader.cs b/LarkatorGUI/ArkReader.cs
@@ -43,7 +43,6 @@ public async Task PerformConversion(bool force = false)
             if (force || IsConversionRequired())
             {
                 await RunArkTools();
-                ClassMapping.Clear();
             }
 
             if (ClassMapping.Count == 0)
@@ -76,8 +75,14 @@ private async Task RunArkTools()
             }
 
             executing = true;
-            await ExecuteArkTools(Tamed ? "tamed" : "wild", Properties.Settings.Default.SaveFile, outputDir);
-            executing = false;
+            try
+            {
+                await ExecuteArkTools(Tamed ? "tamed" : "wild", Properties.Settings.Default.SaveFile, outputDir);
+            }
+            finally
+            {
+                executing = false;
+            }
 
             // Clear previously loaded data
             ClassMapping.Clear();
@@ -110,6 +115,9 @@ private async Task LoadClassesJson()
                 .Select(mapping => new { Cls = mapping["cls"].Value<string>(), Name = mapping["name"].Value<string>() })
                 .Where(m => !m.Cls.Contains("BP_Ocean_C"))
                 .ToDictionary(m => m.Name, m => m.Cls);
+
+            if (ClassMapping.Count <= 0)
+                throw new ExternalToolsException("ARK Tools produced no classes output");
         }
 
         private async Task LoadSpecies(string speciesName)

diff --git a/LarkatorGUI/MainWindow.xaml.cs b/LarkatorGUI/MainWindow.xaml.cs
@@ -378,6 +378,8 @@ private async Task UpdateArkToolsData()
 
         private async Task ReReadArk(bool force = false)
         {
+            if (IsLoading) return;
+
             await PerformConversion(force);
             await LoadSearchSpecies();