From ce660242a4ad016cccbe51cd4cf1f402cb14bb44 Mon Sep 17 00:00:00 2001 From: sr55 Date: Sat, 16 Feb 2019 18:04:49 +0000 Subject: [PATCH] WinGui: Add HandleProcessCorruptedStateExceptions around Init. --- .../HandBrake.Interop/Interop/HandBrakeUtils.cs | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) 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."); + } + } + /// /// Ensures the HB global initialize method has been called. /// -- 2.40.0