Merge branch 'main' into AidanMaskelyne-pr-branch

wabbajack-tools · Aug 13, 2024 · dee8400 · dee8400
2 parents fa4d9ff + 75a07ea
commit dee8400
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@
   * This issue only affected Fallout 3, Fallout NV and Skyrim LE
 * Added logging to determine which downloaded files cannot be hashed
   * This could occur in the downloading phase when installing a modlist when there are broken/corrupted files in the downloads folder
+* Fixed Wabbajack crashing when double-clicking the browser window titlebar or URL
 
 #### Version - 3.7.0.0 - 6/21/2024
 * Added Starfield support

diff --git a/Wabbajack.App.Wpf/Views/BrowserWindow.xaml.cs b/Wabbajack.App.Wpf/Views/BrowserWindow.xaml.cs
@@ -25,7 +25,6 @@ public BrowserWindow(IServiceProvider serviceProvider)
     {
         InitializeComponent();
 
-
         _disposable = new CompositeDisposable();
         _serviceProvider = serviceProvider;
         Browser = _serviceProvider.GetRequiredService<WebView2>();
@@ -43,7 +42,10 @@ public BrowserWindow(IServiceProvider serviceProvider)
 
     private void UIElement_OnMouseDown(object sender, MouseButtonEventArgs e)
     {
-        base.DragMove();
+        if (e.LeftButton == MouseButtonState.Pressed)
+        {
+            base.DragMove();
+        }
     }
 
     private void BrowserWindow_OnActivated(object sender, EventArgs e)

diff --git a/Wabbajack.App.Wpf/Views/MainWindow.xaml.cs b/Wabbajack.App.Wpf/Views/MainWindow.xaml.cs
@@ -144,7 +144,10 @@ private void Window_Closing(object sender, CancelEventArgs e)
 
         private void UIElement_OnMouseDown(object sender, MouseButtonEventArgs e)
         {
-            this.DragMove();
+            if (e.LeftButton == MouseButtonState.Pressed)
+            {
+                this.DragMove();
+            }
         }
 
     }