Enhance Paranoia. Closes #1071. Closes #1074

Squirrel · Jul 10, 2017 · 0df1edb · 0df1edb
1 parent 88f5ff1
commit 0df1edb
Showing 1 changed file with 18 additions and 2 deletions.
diff --git a/src/Update/AnimatedGifWindowWinForms.cs b/src/Update/AnimatedGifWindowWinForms.cs
@@ -66,7 +66,13 @@ public static void ShowWindow(TimeSpan initialDelay, CancellationToken token, Pr
                 }
 
                 var wnd = new AnimatedGifWindow();
-                wnd.Show();
+                if (token.IsCancellationRequested) return;
+
+                try {
+                    wnd.Show();
+                } catch (Exception) {
+                    return;
+                }
 
                 token.Register(() => wnd.Invoke(new Action(() => wnd.Close())));
 
@@ -93,7 +99,17 @@ public static void ShowWindow(TimeSpan initialDelay, CancellationToken token, Pr
                     wnd.Invoke(new Action(() => wnd.TopMost = false));
                 });
 
-                Application.Run(wnd);
+                if (token.IsCancellationRequested) return;
+
+#if !DEBUG
+                try {
+#endif
+                    Application.Run(wnd);
+#if !DEBUG
+                } catch (Exception) {
+                    return;
+                }
+#endif
             });
 
             thread.SetApartmentState(ApartmentState.STA);