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 c39ad153465b1b4748abe5dabdc76001a139b42a..ceeba965c16af38b262f390e5a73298f596e0151 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 0bcf522166ae800dbd6308973e5d94752b4f0e83..e3163a2bec1d29687a14a6d1c607f169860d2912 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
@@ -2299,8 +2299,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