From 3a5365f662fdd94d12733e9c7b1e09745697b532 Mon Sep 17 00:00:00 2001 From: sr55 Date: Sat, 9 Feb 2013 17:15:07 +0000 Subject: WinGui: Fix the source display label for batch scan mode. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5244 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) (limited to 'win') diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs index f97ac2c8c..2ba64e37d 100644 --- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs @@ -666,6 +666,7 @@ namespace HandBrakeWPF.ViewModels } // Use the Path on the Title, or the Source Scan path if one doesn't exist. + this.SourceLabel = this.SourceName; this.CurrentTask.Source = !string.IsNullOrEmpty(this.selectedTitle.SourceName) ? this.selectedTitle.SourceName : this.ScannedSource.ScanPath; this.CurrentTask.Title = value.TitleNumber; this.NotifyOfPropertyChange(() => this.StartEndRangeItems); @@ -1577,16 +1578,7 @@ namespace HandBrakeWPF.ViewModels // Cleanup this.ShowStatusWindow = false; - - if (this.SelectedTitle != null && !string.IsNullOrEmpty(this.SelectedTitle.SourceName)) - { - this.SourceLabel = this.SelectedTitle.SourceName; - } - else - { - this.SourceLabel = this.SourceName; - } - + this.SourceLabel = this.SourceName; this.StatusLabel = "Scan Completed"; }); } @@ -1740,15 +1732,7 @@ namespace HandBrakeWPF.ViewModels this.ShowStatusWindow = false; if (e.Successful) { - if (this.SelectedTitle != null && !string.IsNullOrEmpty(this.SelectedTitle.SourceName)) - { - this.SourceLabel = this.SelectedTitle.SourceName; - } - else - { - this.SourceLabel = this.SourceName; - } - + this.SourceLabel = this.SourceName; this.StatusLabel = "Scan Completed"; } else if (!e.Successful && e.Exception == null) -- cgit v1.2.3