From 9f9d74902c571ed19f9c1cff2d1ec62d3b544961 Mon Sep 17 00:00:00 2001 From: sr55 Date: Sun, 16 Apr 2017 10:59:40 +0100 Subject: [PATCH] WinGui: Fix a possible exception when cancelling and rescanning a source that would cause it to never complete the second time. Fixes #671 --- .../Interop/HandBrakeInstance.cs | 1 - win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs | 6 +++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/win/CS/HandBrake.ApplicationServices/Interop/HandBrakeInstance.cs b/win/CS/HandBrake.ApplicationServices/Interop/HandBrakeInstance.cs index c39ad1534..ceeba965c 100644 --- 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; using System.Drawing; using System.Drawing.Imaging; - using System.IO; using System.Linq; using System.Runtime.ExceptionServices; using System.Runtime.InteropServices; diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs index 0bcf52216..e3163a2be 100644 --- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs @@ -2299,8 +2299,12 @@ namespace HandBrakeWPF.ViewModels /// private void ScanCompleted(object sender, ScanCompletedEventArgs e) { - if (e.ScannedSource != null) + if (e.ScannedSource != null && !e.Cancelled) { + if (this.ScannedSource == null) + { + this.ScannedSource = new Source(); + } e.ScannedSource.CopyTo(this.ScannedSource); } else -- 2.49.0