Mirrored_Repos/wabbajack
1
0
Fork 0
mirror of https://github.com/wabbajack-tools/wabbajack.git synced 2024-08-30 18:42:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

3.4.0.0 Release

Browse Source
This commit is contained in:
Timothy Baldridge 2023-11-19 14:07:46 -07:00
parent 0c11f11839
commit 7be18e8497
5 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -1,6 +1,6 @@
### Changelog ### Changelog
#### Version - 3.3.1.0 - TBA #### Version - 3.4.0.0 - 11/19/2023
* Fixed `--outputPath` not being used for the CLI `compile` (thanks to @majcosta for fixing that) * Fixed `--outputPath` not being used for the CLI `compile` (thanks to @majcosta for fixing that)
* Improved Log message for cases where low storage on the drive Wabbajack is installed on causes compiles to fail * Improved Log message for cases where low storage on the drive Wabbajack is installed on causes compiles to fail
* **To list authors still compiling on Wabbajack 3.0.5.0:** * **To list authors still compiling on Wabbajack 3.0.5.0:**
@ -11,6 +11,8 @@
* Updated Dependencies * Updated Dependencies
* LZ4 to version 1.3.7-beta * LZ4 to version 1.3.7-beta
* SharpZipLib to version 1.4.2 * SharpZipLib to version 1.4.2
* Fully upgraded to .NET 8.0
* Fixed the WebView2 based browser window to no longer crash the application when closed
#### Version - 3.3.0.1 - (Was only a Pre-Release) #### Version - 3.3.0.1 - (Was only a Pre-Release)
* Fixed Manual Downloading on NexusMods being blocked by a hidden cookie consent banner * Fixed Manual Downloading on NexusMods being blocked by a hidden cookie consent banner

1
Wabbajack.App.Wpf/UserIntervention/ManualDownloadHandler.cs
View File

@ -27,5 +27,6 @@ public class ManualDownloadHandler : BrowserWindowViewModel
var uri = await task; var uri = await task;
Intervention.Finish(uri); Intervention.Finish(uri);
await Task.Delay(5000, CancellationToken.None);
} }
} }

13
Wabbajack.App.Wpf/View Models/BrowserWindowViewModel.cs
View File

@ -120,20 +120,27 @@ public abstract class BrowserWindowViewModel : ViewModel
while (_browser.CoreWebView2 == null) while (_browser.CoreWebView2 == null)
await Task.Delay(10, token); await Task.Delay(10, token);
_browser.CoreWebView2.DownloadStarting += (sender, args) => EventHandler<CoreWebView2DownloadStartingEventArgs> handler = null!;
handler = (_, args) =>
{ {
try try
{ {
source.SetResult(new Uri(args.DownloadOperation.Uri)); source.SetResult(new Uri(args.DownloadOperation.Uri));
_browser.CoreWebView2.DownloadStarting -= handler;
} }
catch (Exception) catch (Exception)
{ {
source.SetCanceled(); source.SetCanceled(token);
_browser.CoreWebView2.DownloadStarting -= handler;
} }
args.Cancel = true; args.Cancel = true;
args.Handled = true; args.Handled = true;
}; };
_browser.CoreWebView2.DownloadStarting += handler;
Uri uri; Uri uri;
while (true) while (true)
@ -184,7 +191,7 @@ public abstract class BrowserWindowViewModel : ViewModel
catch (Exception) catch (Exception)
{ {
source.SetCanceled(); source.SetCanceled();
} }
}; };
await source.Task; await source.Task;

2
Wabbajack.App.Wpf/Views/BrowserView.xaml.cs
View File

@ -1,4 +1,6 @@
using System;
using System.Windows.Controls; using System.Windows.Controls;
using Microsoft.Web.WebView2.WinForms;
using ReactiveUI; using ReactiveUI;
namespace Wabbajack.Views; namespace Wabbajack.Views;

2
Wabbajack.App.Wpf/Views/BrowserWindow.xaml.cs
View File

@ -2,6 +2,7 @@ using System;
using System.Reactive.Disposables; using System.Reactive.Disposables;
using System.Reactive.Linq; using System.Reactive.Linq;
using System.Threading; using System.Threading;
using System.Threading.Tasks;
using System.Windows; using System.Windows;
using System.Windows.Input; using System.Windows.Input;
using MahApps.Metro.Controls; using MahApps.Metro.Controls;
@ -57,7 +58,6 @@ public partial class BrowserWindow : MetroWindow
.ContinueWith(_ => Dispatcher.Invoke(() => .ContinueWith(_ => Dispatcher.Invoke(() =>
{ {
Close(); Close();
Browser.Dispose();
Browser = null; Browser = null;
})); }));
} }