WinGui: Another fix for the preset service which was not correctly updating presets when installing a new version.

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

2 files changed, 6 insertions, 6 deletions

diff --git a/win/CS/HandBrake.ApplicationServices/Services/Interfaces/IPresetService.cs b/win/CS/HandBrake.ApplicationServices/Services/Interfaces/IPresetService.cs
index b7d65c1a1..d5807aff9 100644
--- a/win/CS/HandBrake.ApplicationServices/Services/Interfaces/IPresetService.cs
+++ b/win/CS/HandBrake.ApplicationServices/Services/Interfaces/IPresetService.cs
@@ -74,7 +74,7 @@ namespace HandBrake.ApplicationServices.Services.Interfaces
         /// <param name="cliPath">

         /// The Path to the CLI, leave blank for current folder.

         /// </param>

-        void UpdateBuiltInPresets(string cliPath);

+        void UpdateBuiltInPresets();

 

         /// <summary>

         /// Check if the built in Presets stored are not out of date.

diff --git a/win/CS/HandBrake.ApplicationServices/Services/PresetService.cs b/win/CS/HandBrake.ApplicationServices/Services/PresetService.cs
index 75d9805cc..09788e6b4 100644
--- a/win/CS/HandBrake.ApplicationServices/Services/PresetService.cs
+++ b/win/CS/HandBrake.ApplicationServices/Services/PresetService.cs
@@ -64,7 +64,7 @@ namespace HandBrake.ApplicationServices.Services
             // If the preset file doesn't exist. Create it.

             if (!File.Exists(this.builtInPresetFile))

             {

-                this.UpdateBuiltInPresets(string.Empty);

+                this.UpdateBuiltInPresets();

             }

 

             this.LoadPresets();

@@ -204,10 +204,10 @@ namespace HandBrake.ApplicationServices.Services
         /// <param name="cliPath">

         /// The Path to the CLI, leave blank for current folder.

         /// </param>

-        public void UpdateBuiltInPresets(string cliPath)

+        public void UpdateBuiltInPresets()

         {

             // Create a new tempory file and execute the CLI to get the built in Presets.

-            string handbrakeCLIPath = Path.Combine(cliPath, "HandBrakeCLI.exe");

+            string handbrakeCLIPath = Path.Combine(System.Windows.Forms.Application.StartupPath, "HandBrakeCLI.exe");

             string presetsPath = Path.Combine(Path.GetTempPath(), "temp_presets.dat");

             string strCmdLine = String.Format(@"cmd /c """"{0}"" --preset-list >""{1}"" 2>&1""", handbrakeCLIPath, presetsPath);

 

@@ -299,7 +299,7 @@ namespace HandBrake.ApplicationServices.Services
                 {

                     if (preset[0].Version != Properties.Settings.Default.HandBrakeVersion)

                     {

-                        this.UpdateBuiltInPresets(string.Empty);

+                        this.UpdateBuiltInPresets();

                         return true;

                     }

                 }       

@@ -390,7 +390,7 @@ namespace HandBrake.ApplicationServices.Services
             catch (Exception exc)

             {

                 RecoverFromCorruptedPresetFile(this.builtInPresetFile);

-                this.UpdateBuiltInPresets(string.Empty);

+                this.UpdateBuiltInPresets();

                 throw new GeneralApplicationException("HandBrake has detected corruption in the presets file and has attempted to rebuild this file.", "Please restart HandBrake before continuing.", exc);              

             }