summaryrefslogtreecommitdiffstats
path: root/win/CS
diff options
context:
space:
mode:
authorsr55 <[email protected]>2019-02-13 22:04:15 +0000
committersr55 <[email protected]>2019-02-13 22:04:15 +0000
commit49cabc478c21c52f5aaab6cd9b354224adc186d7 (patch)
treea6f7a1fc9f2abf4eca90d06a960373a112f5df77 /win/CS
parente1e0e211759ce1413252b168d2d01479fed9f579 (diff)
WinGui: Temp fix for the build until we can refactor the queue error handling.
Diffstat (limited to 'win/CS')
-rw-r--r--win/CS/HandBrakeWPF/Properties/Resources.Designer.cs9
-rw-r--r--win/CS/HandBrakeWPF/Properties/Resources.resx3
-rw-r--r--win/CS/HandBrakeWPF/ViewModels/MainViewModel.cs2
3 files changed, 13 insertions, 1 deletions
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
@@ -1225,6 +1225,15 @@ namespace HandBrakeWPF.Properties {
}
/// <summary>
+ /// Looks up a localized string similar to Please correct your subtitle settings before continuing. .
+ /// </summary>
+ public static string Main_PleaseFixSubtitleSettings {
+ get {
+ return ResourceManager.GetString("Main_PleaseFixSubtitleSettings", resourceCulture);
+ }
+ }
+
+ /// <summary>
/// Looks up a localized string similar to Please select a folder..
/// </summary>
public static string Main_PleaseSelectFolder {
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.</value>
This will not impact any of the software encoders.</value>
</data>
+ <data name="Main_PleaseFixSubtitleSettings" xml:space="preserve">
+ <value>Please correct your subtitle settings before continuing. </value>
+ </data>
</root> \ 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);