summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsr55 <[email protected]>2012-01-29 12:43:24 +0000
committersr55 <[email protected]>2012-01-29 12:43:24 +0000
commitdf4a57b120d44b029538c903491db6e8797cd98c (patch)
tree11e876f1276a4c8ec2156aaedd0f488413a82f98
parent67e4656971e77322caaba271e53790888636b83c (diff)
WinGui: Fix an issue that was causing the CLI version to be queried on very launch, instead of only when the CLI executable changes.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4425 b64f7644-9d1e-0410-96f1-a4d463321fa5
-rw-r--r--win/CS/Functions/Main.cs2
-rw-r--r--win/CS/HandBrake.ApplicationServices/Services/UserSettingService.cs3
-rw-r--r--win/CS/UserSettingConstants.cs1
3 files changed, 3 insertions, 3 deletions
diff --git a/win/CS/Functions/Main.cs b/win/CS/Functions/Main.cs
index 28909b403..db154ab2f 100644
--- a/win/CS/Functions/Main.cs
+++ b/win/CS/Functions/Main.cs
@@ -310,7 +310,7 @@ namespace Handbrake.Functions
string base64Hash = Convert.ToBase64String(hash);
// Compare the hash with the last known hash. If it's the same, return.
- if (UserSettingService.GetUserSetting<string>(UserSettingConstants.CliExeHash) == base64Hash)
+ if (UserSettingService.GetUserSetting<string>(ASUserSettingConstants.HandBrakeExeHash) == base64Hash)
{
return;
}
diff --git a/win/CS/HandBrake.ApplicationServices/Services/UserSettingService.cs b/win/CS/HandBrake.ApplicationServices/Services/UserSettingService.cs
index eeb003d3c..ead389a5d 100644
--- a/win/CS/HandBrake.ApplicationServices/Services/UserSettingService.cs
+++ b/win/CS/HandBrake.ApplicationServices/Services/UserSettingService.cs
@@ -198,7 +198,7 @@ namespace HandBrake.ApplicationServices.Services
userSettings["PromptOnUnmatchingQueries"] = true;
userSettings["NativeLanguage"] = "Any";
userSettings["DubMode"] = 255;
- userSettings["CliExeHash"] = string.Empty;
+ userSettings["HandBrakeExeHash"] = string.Empty;
userSettings["previewScanCount"] = 10;
userSettings["clearOldLogs"] = true;
userSettings["AutoNameTitleCase"] = true;
@@ -213,6 +213,7 @@ namespace HandBrake.ApplicationServices.Services
userSettings["DubModeSubtitle"] = 0;
userSettings["addOnlyOneAudioPerLanguage"] = true;
userSettings["MinTitleLength"] = 10;
+ userSettings["ShowAdvancedAudioPassthruOpts"] = false;
}
}
}
diff --git a/win/CS/UserSettingConstants.cs b/win/CS/UserSettingConstants.cs
index 87b2f631b..164d06a6f 100644
--- a/win/CS/UserSettingConstants.cs
+++ b/win/CS/UserSettingConstants.cs
@@ -30,7 +30,6 @@ namespace Handbrake
public const string NativeLanguage = "NativeLanguage";
public const string NativeLanguageForSubtitles = "NativeLanguageSubtitles";
public const string DubMode = "DubMode";
- public const string CliExeHash = "CliExeHash";
public const string ClearOldLogs = "clearOldLogs";
public const string AutoNameTitleCase = "AutoNameTitleCase";
public const string AutoNameRemoveUnderscore = "AutoNameRemoveUnderscore";