More progressbox closing in finally blocks

FenPhoenix · Apr 12, 2019 · 41e1e88 · 41e1e88
1 parent c3c934c
commit 41e1e88
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 5 deletions.
diff --git a/AngelLoader/BusinessLogic.cs b/AngelLoader/BusinessLogic.cs
@@ -1191,13 +1191,22 @@ await Task.Run(() =>
                 ProgressBox.HideThis();
             }
 
-            await RestoreSavesAndScreenshots(fm);
+            try
+            {
+                await RestoreSavesAndScreenshots(fm);
+            }
+            catch (Exception ex)
+            {
+                Log("Exception in " + nameof(RestoreSavesAndScreenshots), ex);
+            }
+            finally
+            {
+                ProgressBox.HideThis();
+            }
 
             // Not doing RefreshSelectedFMRowOnly() because that wouldn't update the install/uninstall buttons
             await View.RefreshSelectedFM(refreshReadme: false);
 
-            ProgressBox.HideThis();
-
             return true;
         }
 
@@ -1253,6 +1262,10 @@ await Task.Run(() =>
                         View.ShowAlert(LText.AlertMessages.Extract_ZipExtractFailedFullyOrPartially,
                             LText.AlertMessages.Alert)));
                 }
+                finally
+                {
+                    View.BeginInvoke(new Action(() => ProgressBox.HideThis()));
+                }
             });
 
             return !canceled;
@@ -1317,6 +1330,10 @@ await Task.Run(() =>
                         View.ShowAlert(LText.AlertMessages.Extract_SevenZipExtractFailedFullyOrPartially,
                             LText.AlertMessages.Alert)));
                 }
+                finally
+                {
+                    View.BeginInvoke(new Action(() => ProgressBox.HideThis()));
+                }
             });
 
             return !canceled;

diff --git a/AngelLoader/Properties/AssemblyInfo.cs b/AngelLoader/Properties/AssemblyInfo.cs
@@ -33,6 +33,6 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.2.0")]
-[assembly: AssemblyInformationalVersion("1.0.2")]
+[assembly: AssemblyVersion("1.0.3.0")]
+[assembly: AssemblyInformationalVersion("1.0.3")]
 [assembly: NeutralResourcesLanguage("en-US")]