From 840d4fcfb3c76967ddd6716f34f6222f296592ba Mon Sep 17 00:00:00 2001 From: Timothy Baldridge Date: Mon, 20 Apr 2020 16:36:11 -0600 Subject: [PATCH] Dispose of LibCef Drivers when done --- Wabbajack/View Models/UserInterventionHandlers.cs | 2 +- Wabbajack/View Models/WebBrowserVM.cs | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Wabbajack/View Models/UserInterventionHandlers.cs b/Wabbajack/View Models/UserInterventionHandlers.cs index e07e6e4e..6ea95d7b 100644 --- a/Wabbajack/View Models/UserInterventionHandlers.cs +++ b/Wabbajack/View Models/UserInterventionHandlers.cs @@ -31,7 +31,7 @@ namespace Wabbajack { var cancel = new CancellationTokenSource(); var oldPane = MainWindow.ActivePane; - var vm = await WebBrowserVM.GetNew(); + using var vm = await WebBrowserVM.GetNew(); MainWindow.NavigateTo(vm); vm.BackCommand = ReactiveCommand.Create(() => { diff --git a/Wabbajack/View Models/WebBrowserVM.cs b/Wabbajack/View Models/WebBrowserVM.cs index 2eae4590..aac18c58 100644 --- a/Wabbajack/View Models/WebBrowserVM.cs +++ b/Wabbajack/View Models/WebBrowserVM.cs @@ -14,7 +14,7 @@ using Wabbajack.Lib.WebAutomation; namespace Wabbajack { - public class WebBrowserVM : ViewModel, IBackNavigatingVM + public class WebBrowserVM : ViewModel, IBackNavigatingVM, IDisposable { [Reactive] public string Instructions { get; set; } @@ -38,5 +38,10 @@ namespace Wabbajack // Make sure libraries are extracted first return new WebBrowserVM(url); } + + public void Dispose() + { + Browser.Dispose(); + } } }