summaryrefslogtreecommitdiffstats
path: root/win/CS/HandBrakeWPF/ViewModels
diff options
context:
space:
mode:
authorScott <[email protected]>2015-12-12 14:01:01 +0000
committerScott <[email protected]>2015-12-12 14:02:34 +0000
commit14ba99574efd1127fb48a995b2c74f181e52456e (patch)
tree3359a36391dd15b902ef50d0080b2b83013242b0 /win/CS/HandBrakeWPF/ViewModels
parent0710b0b7d31384cb46ad276252eac3674184f588 (diff)
WinGui: Cosmetic fixes on the Video and Audio Tabs. Bug fix with the Fast Decode checkbox not setting correctly all the time. Improved scan cancel handling.
Diffstat (limited to 'win/CS/HandBrakeWPF/ViewModels')
-rw-r--r--win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
index 20a779e43..b9e8da0e4 100644
--- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
+++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs
@@ -1464,7 +1464,7 @@ namespace HandBrakeWPF.ViewModels
/// </summary>
public void CancelScan()
{
- this.scanService.Stop();
+ this.scanService.Cancel();
}
/// <summary>
@@ -2130,7 +2130,7 @@ namespace HandBrakeWPF.ViewModels
this.HasSource = true;
this.SelectedTitle = this.ScannedSource.Titles.FirstOrDefault(t => t.MainTitle) ?? this.ScannedSource.Titles.FirstOrDefault();
}
- else
+ else if (!e.Cancelled)
{
this.OpenAlertWindow(Resources.Main_ScanNoTitlesFound, Resources.Main_ScanNoTitlesFoundMessage);
}