Fixed the issue with mail rendering page not getting disposed properly.
This commit is contained in:
@@ -535,7 +535,10 @@ public partial class MailRenderingPageViewModel : MailBaseViewModel,
|
|||||||
{
|
{
|
||||||
base.OnNavigatedFrom(mode, parameters);
|
base.OnNavigatedFrom(mode, parameters);
|
||||||
|
|
||||||
renderCancellationTokenSource.Cancel();
|
renderCancellationTokenSource?.Cancel();
|
||||||
|
renderCancellationTokenSource?.Dispose();
|
||||||
|
renderCancellationTokenSource = null;
|
||||||
|
|
||||||
CurrentDownloadPercentage = 0d;
|
CurrentDownloadPercentage = 0d;
|
||||||
|
|
||||||
initializedMailItemViewModel = null;
|
initializedMailItemViewModel = null;
|
||||||
|
|||||||
@@ -14,9 +14,9 @@ using Wino.Core.Domain;
|
|||||||
using Wino.Core.Domain.Enums;
|
using Wino.Core.Domain.Enums;
|
||||||
using Wino.Core.Domain.Interfaces;
|
using Wino.Core.Domain.Interfaces;
|
||||||
using Wino.Core.Domain.Models.Printing;
|
using Wino.Core.Domain.Models.Printing;
|
||||||
using Wino.Mail.WinUI.Extensions;
|
|
||||||
using Wino.Mail.ViewModels.Data;
|
using Wino.Mail.ViewModels.Data;
|
||||||
using Wino.Mail.WinUI;
|
using Wino.Mail.WinUI;
|
||||||
|
using Wino.Mail.WinUI.Extensions;
|
||||||
using Wino.Messaging.Client.Mails;
|
using Wino.Messaging.Client.Mails;
|
||||||
using Wino.Messaging.Client.Shell;
|
using Wino.Messaging.Client.Shell;
|
||||||
using Wino.Views.Abstract;
|
using Wino.Views.Abstract;
|
||||||
@@ -149,6 +149,9 @@ public sealed partial class MailRenderingPage : MailRenderingPageAbstract,
|
|||||||
// Disposing the page.
|
// Disposing the page.
|
||||||
// Make sure the WebView2 is disposed properly.
|
// Make sure the WebView2 is disposed properly.
|
||||||
|
|
||||||
|
ViewModel.SaveHTMLasPDFFunc = null;
|
||||||
|
ViewModel.DirectPrintFuncAsync = null;
|
||||||
|
|
||||||
DisposeWebView2();
|
DisposeWebView2();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user