From: sr55 <sr55.hb@outlook.com>
Date: Sat, 16 Feb 2019 18:04:49 +0000 (+0000)
Subject: WinGui: Add HandleProcessCorruptedStateExceptions around Init.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ce660242a4ad016cccbe51cd4cf1f402cb14bb44;p=handbrake

WinGui: Add HandleProcessCorruptedStateExceptions around Init.
---

diff --git a/win/CS/HandBrake.Interop/Interop/HandBrakeUtils.cs b/win/CS/HandBrake.Interop/Interop/HandBrakeUtils.cs
index 7f36a406c..9c499c9c5 100644
--- a/win/CS/HandBrake.Interop/Interop/HandBrakeUtils.cs
+++ b/win/CS/HandBrake.Interop/Interop/HandBrakeUtils.cs
@@ -13,6 +13,7 @@ namespace HandBrake.Interop.Interop
     using System.Collections.Generic;
     using System.Linq.Expressions;
     using System.Runtime.CompilerServices;
+    using System.Runtime.ExceptionServices;
     using System.Runtime.InteropServices;
 
     using HandBrake.Interop.Interop.EventArgs;
@@ -64,11 +65,7 @@ namespace HandBrake.Interop.Interop
             {
                 try
                 {
-
-                    if (HBFunctions.hb_global_init() == -1)
-                    {
-                        throw new InvalidOperationException("HB global init failed.");
-                    }
+                    TryInit();
                 }
                 catch (Exception e)
                 {
@@ -88,6 +85,15 @@ namespace HandBrake.Interop.Interop
             }
         }
 
+        [HandleProcessCorruptedStateExceptions]
+        static void TryInit()
+        {
+            if (HBFunctions.hb_global_init() == -1)
+            {
+                throw new InvalidOperationException("HB global init failed.");
+            }
+        }
+
         /// <summary>
         /// Ensures the HB global initialize method has been called.
         /// </summary>