WinGui: Don't allow the user to enter invalid filename characters in the "File Format" autoname text box. Also sanitise the input on startup for legacy users which bad options. Fixes #182

2 files changed, 14 insertions, 2 deletions

diff --git a/win/CS/HandBrakeWPF/Properties/ResourcesUI.Designer.cs b/win/CS/HandBrakeWPF/Properties/ResourcesUI.Designer.cs
index c67fddf27..f39eed8f8 100644
--- a/win/CS/HandBrakeWPF/Properties/ResourcesUI.Designer.cs
+++ b/win/CS/HandBrakeWPF/Properties/ResourcesUI.Designer.cs
@@ -1105,7 +1105,7 @@ namespace HandBrakeWPF.Properties {
         }

         

         /// <summary>

-        ///   Looks up a localized string similar to Format:.

+        ///   Looks up a localized string similar to File Format:.

         /// </summary>

         public static string Options_Format {

             get {

@@ -1411,6 +1411,15 @@ namespace HandBrakeWPF.Properties {
         }

         

         /// <summary>

+        ///   Looks up a localized string similar to The file format entered contained invalid characters. These have been removed. .

+        /// </summary>

+        public static string OptionsView_InvalidFileFormatChars {

+            get {

+                return ResourceManager.GetString("OptionsView_InvalidFileFormatChars", resourceCulture);

+            }

+        }

+        

+        /// <summary>

         ///   Looks up a localized string similar to Anamorphic:.

         /// </summary>

         public static string PictureSettingsView_Anamorphic {

diff --git a/win/CS/HandBrakeWPF/Properties/ResourcesUI.resx b/win/CS/HandBrakeWPF/Properties/ResourcesUI.resx
index ef6cd111f..5b6a8bad0 100644
--- a/win/CS/HandBrakeWPF/Properties/ResourcesUI.resx
+++ b/win/CS/HandBrakeWPF/Properties/ResourcesUI.resx
@@ -736,7 +736,7 @@
     <value>Disable LibDVDNav. (libdvdread will be used instead)</value>

   </data>

   <data name="Options_Format" xml:space="preserve">

-    <value>Format:</value>

+    <value>File Format:</value>

   </data>

   <data name="Options_General" xml:space="preserve">

     <value>General</value>

@@ -872,4 +872,7 @@ This will not affect your current settings in the Subtitle tab.</value>
   <data name="SubtitleView_SubtitleDefaultsDescription" xml:space="preserve">

     <value>Configure how the Subtitle Tracks are automatically selected and configured when you select a new title or source video.</value>

   </data>

+  <data name="OptionsView_InvalidFileFormatChars" xml:space="preserve">

+    <value>The file format entered contained invalid characters. These have been removed. </value>

+  </data>

 </root>
\ No newline at end of file