From 3353a0f4ee5b6f1c99ac6f3fdbca4c331cc25c5c Mon Sep 17 00:00:00 2001
From: sr55 <sr55.hb@outlook.com>
Date: Sat, 17 Mar 2012 13:11:46 +0000
Subject: WinGui: (trunk) Fix an issue with the update check / build number
 storage code. It could throw an exception under certain circumstances.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4505 b64f7644-9d1e-0410-96f1-a4d463321fa5
---
 win/CS/Functions/Main.cs         | 2 +-
 win/CS/ToolWindows/UpdateInfo.cs | 4 ++--
 win/CS/frmMain.cs                | 7 +++++--
 3 files changed, 8 insertions(+), 5 deletions(-)

(limited to 'win/CS')

diff --git a/win/CS/Functions/Main.cs b/win/CS/Functions/Main.cs
index 709f43ae9..9744d6aa7 100644
--- a/win/CS/Functions/Main.cs
+++ b/win/CS/Functions/Main.cs
@@ -371,7 +371,7 @@ namespace Handbrake.Functions
             }
             catch (Exception e)
             {
-                UserSettingService.SetUserSetting(ASUserSettingConstants.HandBrakeBuild, string.Empty);
+                UserSettingService.SetUserSetting(ASUserSettingConstants.HandBrakeBuild, 0);
                 UserSettingService.SetUserSetting(ASUserSettingConstants.HandBrakePlatform, string.Empty);
                 UserSettingService.SetUserSetting(ASUserSettingConstants.HandBrakeVersion, string.Empty);
                 UserSettingService.SetUserSetting(ASUserSettingConstants.HandBrakeExeHash, string.Empty);
diff --git a/win/CS/ToolWindows/UpdateInfo.cs b/win/CS/ToolWindows/UpdateInfo.cs
index f86b0dbd7..a893dbccc 100644
--- a/win/CS/ToolWindows/UpdateInfo.cs
+++ b/win/CS/ToolWindows/UpdateInfo.cs
@@ -28,7 +28,7 @@ namespace Handbrake.ToolWindows
         /// <summary>
         /// The Current Build
         /// </summary>
-        private readonly string currentBuild;
+        private readonly int currentBuild;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="UpdateInfo"/> class.
@@ -42,7 +42,7 @@ namespace Handbrake.ToolWindows
         /// <param name="currentBuild">
         /// The current Build.
         /// </param>
-        public UpdateInfo(UpdateCheckInformation reader, string currentVersion, string currentBuild)
+        public UpdateInfo(UpdateCheckInformation reader, string currentVersion, int currentBuild)
         {
             InitializeComponent();
 
diff --git a/win/CS/frmMain.cs b/win/CS/frmMain.cs
index a142b5d76..8f80de22f 100644
--- a/win/CS/frmMain.cs
+++ b/win/CS/frmMain.cs
@@ -223,7 +223,7 @@ namespace Handbrake
                 if (info.NewVersionAvailable)
                 {
                     UpdateInfo updateWindow = new UpdateInfo(info, userSettingService.GetUserSetting<string>(ASUserSettingConstants.HandBrakeVersion),
-                        userSettingService.GetUserSetting<string>(ASUserSettingConstants.HandBrakeBuild));
+                        userSettingService.GetUserSetting<int>(ASUserSettingConstants.HandBrakeBuild));
                     updateWindow.ShowDialog();
                 }
             }
@@ -2584,7 +2584,10 @@ namespace Handbrake
 
                 if (info.NewVersionAvailable)
                 {
-                    UpdateInfo updateWindow = new UpdateInfo(info, userSettingService.GetUserSetting<string>(ASUserSettingConstants.HandBrakeVersion), userSettingService.GetUserSetting<string>(ASUserSettingConstants.HandBrakeBuild));
+                    UpdateInfo updateWindow = new UpdateInfo(
+                        info, 
+                        userSettingService.GetUserSetting<string>(ASUserSettingConstants.HandBrakeVersion), 
+                        userSettingService.GetUserSetting<int>(ASUserSettingConstants.HandBrakeBuild));
                     updateWindow.ShowDialog();
                 }
                 else
-- 
cgit v1.2.3