Resolve switching issue

Author: Gymnasiast

src/openlauncher/MainWindow.axaml.cs

@@ -108,6 +108,76 @@ private async void gameListView_SelectionChanged(object sender, SelectionChanged
             _configService.SelectingGame = gameListView.SelectedIndex;
             await SetPageAsync(gameListView.SelectedItem as GameMenuItem);
         }
+        
+        private async void InstallLatestBuildFromVersionDropdown()
+        {
+            if (_selectedMenuItem == null)
+                return;
+        
+            var selectedItem = versionDropdown.SelectedItem as ComboBoxItem;
+            if (selectedItem?.Tag is Build build)
+            {
+                var currentVersion = await _selectedMenuItem.InstallService.GetCurrentVersionAsync();
+                if (build.Version == currentVersion)
+                    return;
+            
+                try
+                {
+                    downloadProgress.IsVisible = true;
+                    SetAllInteractionEnabled(false);
+    
+                    var assets = build.Assets
+                        .Where(x => x.IsPortable)
+                        .Where(x => x.IsApplicableForCurrentPlatform())
+                        .OrderBy(x => x, BuildAssetComparer.Default)
+                        .ToArray();
+                        
+                    var asset = assets.FirstOrDefault();
+                    if (asset == null)
+                    {
+                        return;
+                    }
+                    
+                    var progress = new Progress<DownloadProgressReport>();
+                    progress.ProgressChanged += (s, report) =>
+                    {
+                        Dispatcher.UIThread.Post(() =>
+                        {
+                            downloadButton.Content = report.Status;
+                            if (report.Value is float value)
+                            {
+                                downloadProgress.IsIndeterminate = false;
+                                downloadProgress.Value = value;
+                            }
+                            else
+                            {
+                                downloadProgress.IsIndeterminate = true;
+                            }
+                        });
+                    };
+        
+                    var cts = new CancellationTokenSource();
+                    await _selectedMenuItem.InstallService.DownloadVersion(
+                        new DownloadService(),
+                        new Shell(),
+                        build.Version,
+                        asset.Uri,
+                        progress,
+                        cts.Token);
+                    await RefreshInstalledVersionAsync();
+                }
+                catch (Exception ex)
+                {
+                    ShowError(StringResources.DownloadBuildFailedTitle, ex);
+                }
+                finally
+                {
+                    downloadButton.Content = StringResources.Download;
+                    downloadProgress.IsVisible = false;
+                    SetAllInteractionEnabled(true);
+                }
+            }
+        }
 
         private async void showDevelopmentVersionsCheckbox_Changed(object sender, RoutedEventArgs e)
         {
@@ -123,81 +193,16 @@ private void autoUpdateGameCheckbox_Changed(object sender, RoutedEventArgs e)
                 return;
             _configService.AutoUpdateGame = autoUpdateGameCheckbox.IsChecked ?? false;
             SetAllInteractionEnabled(true);
-        }
-               
-        private async void DownloadBuild(Build build)
-        {
-            if (_selectedMenuItem == null)
-                return;
-                
-            var currentVersion = await _selectedMenuItem.InstallService.GetCurrentVersionAsync();
-            if (build.Version == currentVersion)
-                return;
-        
-            try
+            
+            if (_configService.AutoUpdateGame)
             {
-                downloadProgress.IsVisible = true;
-                SetAllInteractionEnabled(false);
-
-                var assets = build.Assets
-                    .Where(x => x.IsPortable)
-                    .Where(x => x.IsApplicableForCurrentPlatform())
-                    .OrderBy(x => x, BuildAssetComparer.Default)
-                    .ToArray();
-                    
-                var asset = assets.FirstOrDefault();
-                if (asset == null)
-                {
-                    return;
-                }
-                
-                var progress = new Progress<DownloadProgressReport>();
-                progress.ProgressChanged += (s, report) =>
-                {
-                    Dispatcher.UIThread.Post(() =>
-                    {
-                        downloadButton.Content = report.Status;
-                        if (report.Value is float value)
-                        {
-                            downloadProgress.IsIndeterminate = false;
-                            downloadProgress.Value = value;
-                        }
-                        else
-                        {
-                            downloadProgress.IsIndeterminate = true;
-                        }
-                    });
-                };
-    
-                var cts = new CancellationTokenSource();
-                await _selectedMenuItem.InstallService.DownloadVersion(
-                    new DownloadService(),
-                    new Shell(),
-                    build.Version,
-                    asset.Uri,
-                    progress,
-                    cts.Token);
-                await RefreshInstalledVersionAsync();
-            }
-            catch (Exception ex)
-            {
-                ShowError(StringResources.DownloadBuildFailedTitle, ex);
-            }
-            finally
-            {
-                downloadButton.Content = StringResources.Download;
-                downloadProgress.IsVisible = false;
-                SetAllInteractionEnabled(true);
+                InstallLatestBuildFromVersionDropdown();
             }
         }
-
+               
         private void downloadButton_Click(object sender, RoutedEventArgs e)
         {
-            var selectedItem = versionDropdown.SelectedItem as ComboBoxItem;
-            if (selectedItem?.Tag is Build build)
-            {
-                DownloadBuild(build);
-            }
+            InstallLatestBuildFromVersionDropdown();
         }
 
         private async void playButton_Click(object sender, RoutedEventArgs e)
@@ -288,9 +293,9 @@ private async Task RefreshAvailableVersionsAsync()
                     {
                         downloadButton.IsEnabled = !_configService.AutoUpdateGame;
                         versionDropdown.IsHitTestVisible = true;
-                        if (_configService.AutoUpdateGame && builds.Length > 0)
+                        if (_configService.AutoUpdateGame)
                         {
-                            DownloadBuild(builds[0]);
+                            InstallLatestBuildFromVersionDropdown();
                         }
                     }
                 }