4.0.0.1

Author: halgari

CHANGELOG.md

@@ -1,5 +1,11 @@
 ### Changelog
 
+#### Version - 4.0.0.1 - 3/18/2025
+* Fixed an issue where manual downloads would get stuck after only a few browser pop-ups
+* Fixed the new Wabbajack reset working not working in some cases
+* The MEGA login timeout has been increased to 30 seconds from 10 seconds to hopefully help with login errors.
+* GPU detection logic has been adjusted to account for virtual video controllers and video controllers without a reported refresh rate (thanks to [@kaeltis](https://www.github.com/kaeltis))
+
 #### Version - 4.0.0.0 - 3/17/2025
 * The entire UI has been overhauled to hopefully better guide users during installation/compilation and such.
   * Major thanks to [@CritLoren](https://www.github.com/CritLoren) for coming up with a lot of ideas behind the redesign and creating [Figma mock-ups](https://www.figma.com/design/SylohOBwdYAtPbOj5VMQ25/Wabbajack-v4).

Wabbajack.App.Wpf/UserIntervention/ManualDownloadHandler.cs

@@ -30,7 +30,6 @@ protected override async Task Run(CancellationToken token)
             });
             await NavigateTo(md.Url);
             uri = await task;
-
         }
         finally
         {

Wabbajack.App.Wpf/Util/SystemParametersConstructor.cs

@@ -124,18 +124,27 @@ public SystemParameters Create()
 
         private string GetGPUName()
         {
+            HashSet<string> gpuManufacturers = ["amd", "intel", "nvidia"];
             string gpuName = "";
+            uint gpuRefreshRate = 0;
+            
             try
             {
                 ManagementObjectSearcher videoControllers = new ManagementObjectSearcher("SELECT * FROM Win32_VideoController");
-
-                uint gpuRefreshRate = 0;
-
+            
                 foreach (ManagementObject obj in videoControllers.Get())
                 {
-                    var currentRefreshRate = (uint)obj["CurrentRefreshRate"];
-                    if (currentRefreshRate > gpuRefreshRate)
-                        gpuName = obj["Description"].ToString();
+                    if (obj["CurrentRefreshRate"] != null && obj["Description"] != null)
+                    {
+                        var currentRefreshRate = (uint)obj["CurrentRefreshRate"];
+                        var currentName = obj["Description"].ToString();
+                        
+                        if (gpuManufacturers.Any(s => currentName.Contains(s, StringComparison.OrdinalIgnoreCase)) && currentRefreshRate > gpuRefreshRate)
+                        {
+                            gpuName = currentName;
+                            gpuRefreshRate = currentRefreshRate;
+                        }
+                    }
                 }
             }
             catch(Exception ex)

Wabbajack.App.Wpf/ViewModels/BrowserWindowViewModel.cs

@@ -1,11 +1,9 @@
 using System;
 using System.Linq;
-using System.Reactive.Disposables;
 using System.Text.Json;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows.Input;
-using System.Windows.Threading;
 using HtmlAgilityPack;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Web.WebView2.Core;
@@ -17,7 +15,6 @@
 using Wabbajack.Hashing.xxHash64;
 using Wabbajack.Messages;
 using Wabbajack.Paths;
-using System.Reactive.Concurrency;
 using Microsoft.Extensions.Logging;
 
 namespace Wabbajack;

Wabbajack.App.Wpf/ViewModels/Interventions/MegaLoginVM.cs

@@ -57,10 +57,9 @@ public MegaLoginVM(ILogger<MegaLoginVM> logger, MegaTokenProvider tokenProvider,
         {
             TriedLoggingIn = true;
             LoggingIn = true;
-            // Since  the login task can gets stuck on a failed login, cancel the login task if it hasn't returned after 10s
+            // Since the login task can gets stuck on a failed login, cancel the login task if it hasn't returned after 10s
             using var tokenSource = new CancellationTokenSource();
-            tokenSource.Token.ThrowIfCancellationRequested();
-            tokenSource.CancelAfter(10000);
+            tokenSource.CancelAfter(TimeSpan.FromSeconds(30));
             Task<(AuthInfos Auth, LogonSessionToken Login)> loginTask = DoLogin(tokenSource.Token);
             try
             {
@@ -74,6 +73,9 @@ public MegaLoginVM(ILogger<MegaLoginVM> logger, MegaTokenProvider tokenProvider,
             }
             catch (Exception ex)
             {
+                if (ex is OperationCanceledException)
+                    _logger.LogError("Request timed out, MEGA login cancelled!");
+
                 _logger.LogError("Failed to log into MEGA: {ex}", ex.ToString());
                 LoginSuccessful = false;
             }

Wabbajack.App.Wpf/ViewModels/MainWindowVM.cs

@@ -38,7 +38,7 @@ namespace Wabbajack;
 /// </summary>
 public class MainWindowVM : ViewModel
 {
-    private object _browserLocker = new object();
+    private Common.AsyncLock _browserLocker = new();
     public MainWindow MainWindow { get; }
 
     [Reactive]
@@ -66,11 +66,11 @@ public class MainWindowVM : ViewModel
     public readonly FileUploadVM FileUploadVM;
     public readonly MegaLoginVM MegaLoginVM;
     public readonly UserInterventionHandlers UserInterventionHandlers;
+
     private readonly Client _wjClient;
     private readonly ILogger<MainWindowVM> _logger;
     private readonly ResourceMonitor _resourceMonitor;
     private readonly SystemParametersConstructor _systemParams;
-
     private readonly IServiceProvider _serviceProvider;
 
     public ICommand CopyVersionCommand { get; }
@@ -332,6 +332,7 @@ private void HandleManualBlobDownload(ManualBlobDownload manualDownload)
 
     private async void HandleShowBrowserWindow(ShowBrowserWindow msg)
     {
+        using var _ = await _browserLocker.WaitAsync();
         var browserWindow = _serviceProvider.GetRequiredService<BrowserWindow>();
         ActiveFloatingPane = browserWindow.ViewModel = msg.ViewModel;
         browserWindow.DataContext = ActiveFloatingPane;

Wabbajack.App.Wpf/ViewModels/Settings/SettingsVM.cs

@@ -70,14 +70,17 @@ private void Reset()
     {
         try
         {
+            _logger.LogInformation("Resetting Wabbajack!");
             var currentPath = Path.GetDirectoryName(Assembly.GetEntryAssembly()!.Location);
             var cliDir = Path.Combine(currentPath, "cli");
             string workingDir = Directory.Exists(cliDir) ? cliDir : currentPath;
+            _logger.LogInformation("Launching CLI from directory {workingDir}", workingDir);
             Process.Start(new ProcessStartInfo()
             {
-                FileName = "wabbajack-cli.exe",
+                FileName = Path.Combine(workingDir, "wabbajack-cli.exe"),
                 Arguments = "reset",
-                CreateNoWindow = true
+                CreateNoWindow = true,
+                WorkingDirectory = workingDir
             });
         }
         catch (Exception ex)

Wabbajack.App.Wpf/ViewModels/UserInterventionHandlers.cs

@@ -14,7 +14,6 @@ namespace Wabbajack;
 public class UserInterventionHandlers
 {
     public MainWindowVM MainWindow { get; }
-    private AsyncLock _browserLock = new();
     private readonly ILogger<UserInterventionHandlers> _logger;
 
     public UserInterventionHandlers(ILogger<UserInterventionHandlers> logger, MainWindowVM mvm)

Wabbajack.App.Wpf/Views/Installers/InstallationView.xaml.cs

@@ -270,6 +270,7 @@ public InstallationView()
             ReadmeToggleButton.IsChecked = true;
 
             MessageBus.Current.Listen<ShowFloatingWindow>()
+                              .ObserveOnGuiThread()
                               .Subscribe(msg =>
                               {
                                   if (msg.Screen == FloatingScreenType.None && (ReadmeToggleButton.IsChecked ?? false))