Fix Manual Game Switching doesn't reload the page

Thanks to @studiobutter for noticing on Discord

Author: neon-nyan

CollapseLauncher/Classes/RegionManagement/RegionManagement.cs

@@ -297,25 +297,25 @@ private static bool IsNotificationTimestampValid(NotificationProp Entry)
             return isBeginValid && isEndValid;
         }
 
+        private async void ChangeRegion(object sender, RoutedEventArgs e)
+        {
+            try
+            {
+                ToggleChangeRegionBtn(sender, true);
+                ChangeRegionInstant();
+            }
+            finally
+            {
+                ToggleChangeRegionBtn(sender, false);
+            }
+        }
+
         private async void ChangeRegionNoWarning(object sender, RoutedEventArgs e)
         {
             try
             {
                 (sender as Button)?.IsEnabled = false;
-                if (!IsLoadRegionComplete)
-                {
-                    return;
-                }
-
-                _lockRegionChangeBtn = true;
-                _currentGameCategory = ComboBoxGameTitle.SelectedIndex;
-                _currentGameRegion   = ComboBoxGameRegion.SelectedIndex;
-                await LoadRegionRootButton();
-                InvokeLoadingRegionPopup(false);
-
-                MainFrameChanger.ChangeMainFrame(m_appMode == AppMode.Hi3CacheUpdater
-                                                     ? typeof(CachesPage)
-                                                     : typeof(HomePage), true);
+                ChangeRegionInstant();
             }
             catch (Exception ex)
             {
@@ -324,7 +324,7 @@ private async void ChangeRegionNoWarning(object sender, RoutedEventArgs e)
             }
             finally
             {
-                _lockRegionChangeBtn = false;
+                (sender as Button)?.IsEnabled = true;
             }
         }
 
@@ -341,7 +341,6 @@ private async void ChangeRegionInstant()
                 _currentGameCategory = ComboBoxGameTitle.SelectedIndex;
                 _currentGameRegion   = ComboBoxGameRegion.SelectedIndex;
                 await LoadRegionRootButton();
-                InvokeLoadingRegionPopup(false);
 
                 MainFrameChanger.ChangeMainFrame(m_appMode == AppMode.Hi3CacheUpdater
                                                      ? typeof(CachesPage)
@@ -355,39 +354,7 @@ private async void ChangeRegionInstant()
             finally
             {
                 _lockRegionChangeBtn = false;
-            }
-        }
-
-        private async void ChangeRegion(object sender, RoutedEventArgs e)
-        {
-            try
-            {
-                if (!IsLoadRegionComplete)
-                {
-                    return;
-                }
-
-                // Disable ChangeRegionBtn and hide flyout
-                _lockRegionChangeBtn = true;
-                ToggleChangeRegionBtn(sender, true);
-                if (!await LoadRegionRootButton())
-                {
-                    return;
-                }
-
-                // Finalize loading
-                ToggleChangeRegionBtn(sender, false);
-                _currentGameCategory = ComboBoxGameTitle.SelectedIndex;
-                _currentGameRegion   = ComboBoxGameRegion.SelectedIndex;
-            }
-            catch (Exception ex)
-            {
-                LogWriteLine($"Failed while changing region with normal method\r\n{ex}", LogType.Error, true);
-                await SentryHelper.ExceptionHandlerAsync(ex);
-            }
-            finally
-            {
-                _lockRegionChangeBtn = false;
+                InvokeLoadingRegionPopup(false);
             }
         }