From 1c5726245ae164a935565606d6f85ca45aadfed3 Mon Sep 17 00:00:00 2001 From: JanuarySnow Date: Wed, 17 Jul 2024 14:03:05 +0100 Subject: [PATCH 1/3] added sanity checks for dragmove for actual button being pressed --- Wabbajack.App.Wpf/Views/BrowserWindow.xaml.cs | 7 +++++-- Wabbajack.App.Wpf/Views/MainWindow.xaml.cs | 6 +++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Wabbajack.App.Wpf/Views/BrowserWindow.xaml.cs b/Wabbajack.App.Wpf/Views/BrowserWindow.xaml.cs index a77c5b78..76f78e14 100644 --- a/Wabbajack.App.Wpf/Views/BrowserWindow.xaml.cs +++ b/Wabbajack.App.Wpf/Views/BrowserWindow.xaml.cs @@ -9,6 +9,7 @@ using System.Windows.Controls; using System.Windows.Input; using MahApps.Metro.Controls; using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.Logging; using Microsoft.Web.WebView2.Wpf; using ReactiveUI; using Wabbajack.Common; @@ -25,7 +26,6 @@ public partial class BrowserWindow : MetroWindow { InitializeComponent(); - _disposable = new CompositeDisposable(); _serviceProvider = serviceProvider; Browser = _serviceProvider.GetRequiredService(); @@ -43,7 +43,10 @@ public partial class BrowserWindow : MetroWindow 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 index 2135f5c0..dd43c0cd 100644 --- a/Wabbajack.App.Wpf/Views/MainWindow.xaml.cs +++ b/Wabbajack.App.Wpf/Views/MainWindow.xaml.cs @@ -8,6 +8,7 @@ using System.Windows.Input; using DynamicData.Binding; using MahApps.Metro.Controls; using Microsoft.Extensions.Logging; +using NLog; using ReactiveUI; using Wabbajack.Common; using Wabbajack.Messages; @@ -144,7 +145,10 @@ namespace Wabbajack private void UIElement_OnMouseDown(object sender, MouseButtonEventArgs e) { - this.DragMove(); + if (e.LeftButton == MouseButtonState.Pressed) + { + this.DragMove(); + } } } From d911eab6d868a517ffd39489caf74dca078297ed Mon Sep 17 00:00:00 2001 From: JanuarySnow Date: Wed, 17 Jul 2024 14:04:02 +0100 Subject: [PATCH 2/3] redundant includes --- Wabbajack.App.Wpf/Views/BrowserWindow.xaml.cs | 1 - Wabbajack.App.Wpf/Views/MainWindow.xaml.cs | 1 - 2 files changed, 2 deletions(-) diff --git a/Wabbajack.App.Wpf/Views/BrowserWindow.xaml.cs b/Wabbajack.App.Wpf/Views/BrowserWindow.xaml.cs index 76f78e14..d9fb6645 100644 --- a/Wabbajack.App.Wpf/Views/BrowserWindow.xaml.cs +++ b/Wabbajack.App.Wpf/Views/BrowserWindow.xaml.cs @@ -9,7 +9,6 @@ using System.Windows.Controls; using System.Windows.Input; using MahApps.Metro.Controls; using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Logging; using Microsoft.Web.WebView2.Wpf; using ReactiveUI; using Wabbajack.Common; diff --git a/Wabbajack.App.Wpf/Views/MainWindow.xaml.cs b/Wabbajack.App.Wpf/Views/MainWindow.xaml.cs index dd43c0cd..13c14e6f 100644 --- a/Wabbajack.App.Wpf/Views/MainWindow.xaml.cs +++ b/Wabbajack.App.Wpf/Views/MainWindow.xaml.cs @@ -8,7 +8,6 @@ using System.Windows.Input; using DynamicData.Binding; using MahApps.Metro.Controls; using Microsoft.Extensions.Logging; -using NLog; using ReactiveUI; using Wabbajack.Common; using Wabbajack.Messages; From 8281e77247fd9abf967c6a6e4aac5436738fb508 Mon Sep 17 00:00:00 2001 From: trawzified <55751269+tr4wzified@users.noreply.github.com> Date: Tue, 13 Aug 2024 22:13:56 +0200 Subject: [PATCH 3/3] Update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8d76f815..2ecfdf9e 100644 --- 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