Logic error in culture handler.

Author: basildane

AboutBox.es.resx

@@ -48,6 +48,11 @@ Public NotInheritable Class AboutBox
         AutoUpdater.Start(0)
     End Sub
 
+    Private Sub pbUpdate_Click(sender As Object, e As EventArgs) Handles pbUpdate.Click
+        AutoUpdater.force = True
+        AutoUpdater.Start(0)
+    End Sub
+
     Private Delegate Sub UpdateStatusHandler(sender As Object, e As AutoUpdateEventArgs)
 
     Private Sub UpdateStatus(sender As Object, e As AutoUpdateEventArgs)

AboutBox.resx

@@ -55,7 +55,7 @@ Namespace My
             upgradeSettings()
             ConfigureCulture()
 
-            Dim version As String = System.String.Format(Resources.Strings.Version, Application.Info.Version.Major, Application.Info.Version.Minor, Application.Info.Version.Build, Application.Info.Version.Revision)
+            Dim version As String = String.Format(Resources.Strings.Version, Application.Info.Version.Major, Application.Info.Version.Minor, Application.Info.Version.Build, Application.Info.Version.Revision)
 
             If (Application.Info.Version.Revision > 0) Then
                 version &= " BETA " & Application.Info.Version.Revision
@@ -78,46 +78,41 @@ Namespace My
         ''' <remarks></remarks>
         Private Sub ConfigureCulture()
             Dim regKey As RegistryKey
-            Dim language As String = vbNull
-
-            Try
-                regKey = Registry.CurrentUser.OpenSubKey("Software\Aquila Technology\WakeOnLAN", RegistryKeyPermissionCheck.ReadWriteSubTree)
-                language = regKey.GetValue("Language", String.Empty, RegistryValueOptions.None)
-
-                Select Case language
-                    Case "en"
-                        language = "en-US"
-                    Case "de"
-                        language = "de-DE"
-                    Case "es"
-                        language = "es-ES"
-                    Case "fi"
-                        language = "fi-FI"
-                    Case "fr"
-                        language = "fr-FR"
-                    Case "hu"
-                        language = "hu-HU"
-                    Case "nl"
-                        language = "nl-NL"
-                    Case "ru"
-                        language = "ru-RU"
-                    Case "pt_BR"
-                        language = "pt-BR"
-                    Case "zh_TW"
-                        language = "zh-TW"
-                End Select
-
-                Settings.Language = language
-                regKey.DeleteValue("Language")
-                regKey.Close()
-
-            Catch ex As Exception
-
-            End Try
+            Dim language As String
+
+            regKey = Registry.CurrentUser.OpenSubKey("Software\Aquila Technology\WakeOnLAN", RegistryKeyPermissionCheck.ReadWriteSubTree)
+            language = regKey.GetValue("Language", String.Empty, RegistryValueOptions.None)
+
+            Select Case language
+                Case "en"
+                    language = "en-US"
+                Case "de"
+                    language = "de-DE"
+                Case "es"
+                    language = "es-ES"
+                Case "fi"
+                    language = "fi-FI"
+                Case "fr"
+                    language = "fr-FR"
+                Case "hu"
+                    language = "hu-HU"
+                Case "nl"
+                    language = "nl-NL"
+                Case "ru"
+                    language = "ru-RU"
+                Case "pt_BR"
+                    language = "pt-BR"
+                Case "zh_TW"
+                    language = "zh-TW"
+            End Select
 
             If String.IsNullOrEmpty(language) Then
                 language = "en-US"
+            Else
+                Settings.Language = language
+                regKey.DeleteValue("Language")
             End If
+            regKey.Close()
 
             If String.IsNullOrEmpty(Settings.Language) Then Settings.Language = language
             CultureManager.ApplicationUICulture = New CultureInfo(Settings.Language)

AboutBox.vb

@@ -49,7 +49,7 @@ Imports System.Runtime.InteropServices
 ' You can specify all the values or you can default the Build and Revision Numbers 
 ' by using the '*' as shown below:
 
-<Assembly: AssemblyVersion("2.11.5.0")>
+<Assembly: AssemblyVersion("2.11.5.10")>
 
 <Assembly: ComVisibleAttribute(False)> 
 <Assembly: NeutralResourcesLanguageAttribute("en-US")> 

ApplicationEvents.vb

@@ -111,6 +111,8 @@ public static void OnUpdateStatus(AutoUpdateEventArgs e)
         public static String versionURL;
         public static String versionResult;
 
+        public static Boolean force = false;
+
         public enum RemindLaterFormat
         {
             Minutes,
@@ -285,7 +287,7 @@ private static void BackgroundWorkerDoWork(object sender, DoWorkEventArgs e)
             RunBrowserThread(versionURL);
 
 #if DEBUG
-            if (days == -1)
+            if (force)
             {
                 args.Status = AutoUpdateEventArgs.StatusCodes.updateAvailable;
                 args.Text = Strings.sUpdateAvailable;
@@ -295,6 +297,7 @@ private static void BackgroundWorkerDoWork(object sender, DoWorkEventArgs e)
                 thread.CurrentCulture = thread.CurrentUICulture = CurrentCulture ?? Application.CurrentCulture;
                 thread.SetApartmentState(ApartmentState.STA);
                 thread.Start();
+                return;
             }
 #endif
 
@@ -307,6 +310,7 @@ private static void BackgroundWorkerDoWork(object sender, DoWorkEventArgs e)
             }
 
             if (CurrentVersion <= InstalledVersion) return;
+
             args.Status = AutoUpdateEventArgs.StatusCodes.updateAvailable;
             args.Text = Strings.sUpdateAvailable;
             OnUpdateStatus(args);