Fix browser window getting stuck in half-way state after closing it

wabbajack-tools · Dec 22, 2024 · bf09d50 · bf09d50
1 parent e6677a5
commit bf09d50
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git a/Wabbajack.App.Wpf/Messages/ShowBrowserWindow.cs b/Wabbajack.App.Wpf/Messages/ShowBrowserWindow.cs
@@ -1,5 +1,4 @@
 using ReactiveUI;
-using System;
 
 namespace Wabbajack.Messages;
 

diff --git a/Wabbajack.App.Wpf/ViewModels/BrowserWindowViewModel.cs b/Wabbajack.App.Wpf/ViewModels/BrowserWindowViewModel.cs
@@ -55,12 +55,9 @@ private void Close()
                 Closed -= delegateMethod as EventHandler;
             }
         }
-        Activator.Deactivate();
+        //Activator.Deactivate();
     }
 
-    // Cheating a bit with MVVM principles here
-    public BrowserWindow? View { get; set; }
-
     public async Task RunWrapper(CancellationToken token)
     {
         await Run(token);

diff --git a/Wabbajack.App.Wpf/ViewModels/MainWindowVM.cs b/Wabbajack.App.Wpf/ViewModels/MainWindowVM.cs
@@ -148,6 +148,7 @@ public MainWindowVM(ILogger<MainWindowVM> logger, Client wjClient,
             .DisposeWith(CompositeDisposable);
 
         MessageBus.Current.Listen<ShowFloatingWindow>()
+            .ObserveOnGuiThread()
             .Subscribe(m => HandleShowFloatingWindow(m.Screen))
             .DisposeWith(CompositeDisposable);