WinGui: Fix a possible exception when cancelling and rescanning a source that would...

diff --git a/win/CS/HandBrake.ApplicationServices/Interop/HandBrakeInstance.cs b/win/CS/HandBrake.ApplicationServices/Interop/HandBrakeInstance.cs
index 861a5edafcce855e47922a8e0c28611266d083ed..7114bab6458d4cdd32b3480388cb0f8a51d6ea36 100644 (file)
--- a/win/CS/HandBrake.ApplicationServices/Interop/HandBrakeInstance.cs
+++ b/win/CS/HandBrake.ApplicationServices/Interop/HandBrakeInstance.cs
@@ -14,7 +14,6 @@ namespace HandBrake.ApplicationServices.Interop
     using System.Diagnostics;\r
     using System.Drawing;\r
     using System.Drawing.Imaging;\r
-    using System.IO;\r
     using System.Linq;\r
     using System.Runtime.ExceptionServices;\r
     using System.Runtime.InteropServices;\r

diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
index 9bb991efc2a86655522515abcd2d3f43e9119aab..0c4637e6f69ef85f3698e7481c750e7f8be46041 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
@@ -2336,8 +2336,12 @@ namespace HandBrakeWPF.ViewModels
         /// </param>\r
         private void ScanCompleted(object sender, ScanCompletedEventArgs e)\r
         {\r
-            if (e.ScannedSource != null)\r
+            if (e.ScannedSource != null && !e.Cancelled)\r
             {\r
+                if (this.ScannedSource == null)\r
+                {\r
+                    this.ScannedSource = new Source();\r
+                }\r
                 e.ScannedSource.CopyTo(this.ScannedSource);\r
             }\r
             else\r