WinGui: Preset Save Changes fixes.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4440 b64f7644-9d1e-0410-96f1-a4d463321fa5

2 files changed, 13 insertions, 3 deletions

diff --git a/win/CS/HandBrake.ApplicationServices/Utilities/QueryParserUtility.cs b/win/CS/HandBrake.ApplicationServices/Utilities/QueryParserUtility.cs
index f502b1320..93fbff058 100644
--- a/win/CS/HandBrake.ApplicationServices/Utilities/QueryParserUtility.cs
+++ b/win/CS/HandBrake.ApplicationServices/Utilities/QueryParserUtility.cs
@@ -101,8 +101,8 @@ namespace HandBrake.ApplicationServices.Utilities
             Match audioSampleRates = Regex.Match(input, @"-R ([0-9a-zA-Z.,]*)"); // Auto = a-z

             Match drcValues = Regex.Match(input, @"-D ([0-9.,]*)");

             Match gainValues = Regex.Match(input, @"--gain=([0-9.,-]*)");

-            Match fallbackEncoder = Regex.Match(input, @"--audio-fallback([a-zA-Z0-9:=\s]*)");

-            Match allowedPassthru = Regex.Match(input, @"--audio-copy-mask([a-zA-Z0-9:,=\s]*)");

+            Match fallbackEncoder = Regex.Match(input, @"--audio-fallback([a-zA-Z0-9:=\s ]*)");

+            Match allowedPassthru = Regex.Match(input, @"--audio-copy-mask([a-zA-Z0-9:,=\s ]*)");

 

             // Chapters Tab

             Match chapterMarkers = Regex.Match(input, @" -m");

diff --git a/win/CS/frmMain.cs b/win/CS/frmMain.cs
index 85d854eb6..6e74c96cb 100644
--- a/win/CS/frmMain.cs
+++ b/win/CS/frmMain.cs
@@ -541,6 +541,16 @@ namespace Handbrake
         /// </param>

         private void pmnu_saveChanges_Click(object sender, EventArgs e)

         {

+            if (this.selectedTitle == null)

+            {

+                MessageBox.Show(

+                            "Please scan a source before trying to update a preset.",

+                            "Error",

+                            MessageBoxButtons.OK,

+                            MessageBoxIcon.Error);

+                return;

+            }

+

             DialogResult result =

                 MessageBox.Show(

                     "Do you wish to include picture settings when updating the preset: " +

@@ -554,7 +564,7 @@ namespace Handbrake
                     Query = query,                  

                     CropSettings = (result == DialogResult.Yes),

                     AudioPassthruSettings = this.AudioSettings.PassthruSettings,

-                    Task = QueryParserUtility.Parse(query),

+                    Task = QueryParserUtility.Parse(query),                

                 };

 

             presetHandler.Update(preset);