From 49cabc478c21c52f5aaab6cd9b354224adc186d7 Mon Sep 17 00:00:00 2001 From: sr55 Date: Wed, 13 Feb 2019 22:04:15 +0000 Subject: [PATCH] WinGui: Temp fix for the build until we can refactor the queue error handling. --- win/CS/HandBrakeWPF/Properties/Resources.Designer.cs | 9 +++++++++ win/CS/HandBrakeWPF/Properties/Resources.resx | 3 +++ win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs index 54f78fe92..dce6c03f8 100644 --- a/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs +++ b/win/CS/HandBrakeWPF/Properties/Resources.Designer.cs @@ -1224,6 +1224,15 @@ namespace HandBrakeWPF.Properties { } } + /// + /// Looks up a localized string similar to Please correct your subtitle settings before continuing. . + /// + public static string Main_PleaseFixSubtitleSettings { + get { + return ResourceManager.GetString("Main_PleaseFixSubtitleSettings", resourceCulture); + } + } + /// /// Looks up a localized string similar to Please select a folder.. /// diff --git a/win/CS/HandBrakeWPF/Properties/Resources.resx b/win/CS/HandBrakeWPF/Properties/Resources.resx index d6117ac7b..944e3b93f 100644 --- a/win/CS/HandBrakeWPF/Properties/Resources.resx +++ b/win/CS/HandBrakeWPF/Properties/Resources.resx @@ -1903,4 +1903,7 @@ This will not affect your current settings in the Subtitle tab. This will not impact any of the software encoders. + + Please correct your subtitle settings before continuing. + \ No newline at end of file diff --git a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs index 2f0baa730..17e0b4951 100644 --- a/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs +++ b/win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs @@ -1384,7 +1384,7 @@ namespace HandBrakeWPF.ViewModels // defer to subtitle's validation messages if (!this.SubtitleViewModel.ValidateSubtitles()) { - return false; + return new AddQueueError(Resources.Subtitles_WebmSubtitleIncompatibilityHeader, Resources.Main_PleaseFixSubtitleSettings, MessageBoxButton.OK, MessageBoxImage.Error); } QueueTask task = new QueueTask(new EncodeTask(this.CurrentTask), HBConfigurationFactory.Create(), this.ScannedSource.ScanPath, this.SelectedPreset); -- 2.40.0