WinGui: Minor change that might help #688

diff --git a/win/CS/HandBrakeWPF/Services/Scan/LibScan.cs b/win/CS/HandBrakeWPF/Services/Scan/LibScan.cs
index fdeb88b2d9401902545d5cb93bb9f0ee811185ea..eac84f263172e3c1e3ec203a7dc3e5590ac674c6 100644 (file)
--- a/win/CS/HandBrakeWPF/Services/Scan/LibScan.cs
+++ b/win/CS/HandBrakeWPF/Services/Scan/LibScan.cs
@@ -144,8 +144,7 @@ namespace HandBrakeWPF.Services.Scan
             {
                 this.ServiceLogMessage("Stopping Scan ...");
                 this.IsScanning = false;
-                this.instance.StopScan();
-                this.ServiceLogMessage("Scan Stopped ...");
+                this.instance.StopScan();              
             }
             catch (Exception exc)
             {
@@ -154,6 +153,7 @@ namespace HandBrakeWPF.Services.Scan
             finally
             {
                 this.ScanCompleted?.Invoke(this, new ScanCompletedEventArgs(this.isCancelled, null, null, null));
+                this.ServiceLogMessage("Scan Stopped ...");
             }
         }
 

diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
index c11400bd7541fc089fb5dcd0b15f2f87b2a6ae3d..c8a59bbbc41715f4d0ed7e87f9bba564fe47db1a 100644 (file)
--- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
@@ -2336,6 +2336,8 @@ namespace HandBrakeWPF.ViewModels
         /// </param>\r
         private void ScanCompleted(object sender, ScanCompletedEventArgs e)\r
         {\r
+            this.ShowStatusWindow = false;\r
+\r
             if (e.ScannedSource != null && !e.Cancelled)\r
             {\r
                 if (this.ScannedSource == null)\r
@@ -2351,9 +2353,7 @@ namespace HandBrakeWPF.ViewModels
 \r
             Execute.OnUIThread(() =>\r
             {\r
-                this.ShowStatusWindow = false;\r
-\r
-                if (e.Successful)\r
+                if (e.Successful && this.ScannedSource != null)\r
                 {\r
                     this.NotifyOfPropertyChange(() => this.ScannedSource);\r
                     this.NotifyOfPropertyChange(() => this.ScannedSource.Titles);\r