From d5e59956d359b156e086e7ce36a2b6cb358d3c5c Mon Sep 17 00:00:00 2001
From: sr55 <sr55.hb@outlook.com>
Date: Sun, 7 Oct 2012 14:22:34 +0000
Subject: WinGui: Fix an exception when shutting down.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5004 b64f7644-9d1e-0410-96f1-a4d463321fa5
---
 win/CS/HandBrakeWPF/Services/EncodeServiceWrapper.cs | 6 ++++++
 win/CS/HandBrakeWPF/Services/ScanServiceWrapper.cs   | 3 ++-
 2 files changed, 8 insertions(+), 1 deletion(-)

(limited to 'win')

diff --git a/win/CS/HandBrakeWPF/Services/EncodeServiceWrapper.cs b/win/CS/HandBrakeWPF/Services/EncodeServiceWrapper.cs
index a3506a60d..d68103f78 100644
--- a/win/CS/HandBrakeWPF/Services/EncodeServiceWrapper.cs
+++ b/win/CS/HandBrakeWPF/Services/EncodeServiceWrapper.cs
@@ -18,6 +18,7 @@ namespace HandBrakeWPF.Services
     using HandBrake.ApplicationServices.Model;
     using HandBrake.ApplicationServices.Services;
     using HandBrake.ApplicationServices.Services.Interfaces;
+    using HandBrake.Interop;
 
     using EncodeCompletedEventArgs = HandBrake.ApplicationServices.EventArgs.EncodeCompletedEventArgs;
     using EncodeProgressEventArgs = HandBrake.ApplicationServices.EventArgs.EncodeProgressEventArgs;
@@ -63,6 +64,11 @@ namespace HandBrakeWPF.Services
                     }
                     else
                     {
+                        if (ScanServiceWrapper.HandbrakeInstance == null)
+                        {
+                            ScanServiceWrapper.HandbrakeInstance = new HandBrakeInstance();
+                        }
+
                         this.encodeService = new LibEncode(userSettingService, ScanServiceWrapper.HandbrakeInstance);
                     }
                 }
diff --git a/win/CS/HandBrakeWPF/Services/ScanServiceWrapper.cs b/win/CS/HandBrakeWPF/Services/ScanServiceWrapper.cs
index ffbbae5c0..9cb6707f9 100644
--- a/win/CS/HandBrakeWPF/Services/ScanServiceWrapper.cs
+++ b/win/CS/HandBrakeWPF/Services/ScanServiceWrapper.cs
@@ -33,7 +33,7 @@ namespace HandBrakeWPF.Services
         /// <summary>
         /// The handbrake instance.
         /// </summary>
-        public static readonly IHandBrakeInstance HandbrakeInstance = new HandBrakeInstance();
+        public static IHandBrakeInstance HandbrakeInstance;
 
         /// <summary>
         /// The scan service.
@@ -67,6 +67,7 @@ namespace HandBrakeWPF.Services
                     }
                     else
                     {
+                        HandbrakeInstance = new HandBrakeInstance();
                         this.scanService = new LibScan(userSettingService, HandbrakeInstance);
                     }
                 } 
-- 
cgit v1.2.3