From 6ed78bda75a3e7f0237171b5ab2cf9c2bdb6bfaa Mon Sep 17 00:00:00 2001 From: Alden Wu Date: Sat, 29 Apr 2023 21:18:39 -0700 Subject: [PATCH] Desktop: Kill process if failing to close after delay --- DailyDesktop.Desktop/MainForm.cs | 11 ++++++++++- DailyDesktop.Desktop/MainForm.resx | 3 --- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/DailyDesktop.Desktop/MainForm.cs b/DailyDesktop.Desktop/MainForm.cs index 6f3ffd9..d2ddad7 100644 --- a/DailyDesktop.Desktop/MainForm.cs +++ b/DailyDesktop.Desktop/MainForm.cs @@ -116,7 +116,16 @@ private async void MainForm_Load(object? sender, EventArgs e) stateBackgroundWorker.RunWorkerAsync(); } - private void MainForm_FormClosing(object? sender, EventArgs e) => stateBackgroundWorker.CancelAsync(); + private void MainForm_FormClosing(object? sender, EventArgs e) + { + stateBackgroundWorker.CancelAsync(); + core.Dispose(); + + // TODO: SUPER SUPER SUPER BAD LOL WTF?? + // investigate: maybe has something to do with ProviderStore not + // properly closing dlls? + Task.Delay(10_000).ContinueWith(_ => Process.GetCurrentProcess().Kill()); + } private async void providerComboBox_SelectedIndexChanged(object? sender, EventArgs e) { diff --git a/DailyDesktop.Desktop/MainForm.resx b/DailyDesktop.Desktop/MainForm.resx index 4dcdb17..13ce23d 100644 --- a/DailyDesktop.Desktop/MainForm.resx +++ b/DailyDesktop.Desktop/MainForm.resx @@ -2864,9 +2864,6 @@ New releases: https://github.com/goodtrailer/daily-desktop/releases 5/8H24gfvKsP2DsAAAAASUVORK5CYII= - - 158, 17 - AAABAA0AAAAAAAEAIACMJQAA1gAAAICAAAABACAAKAgBAGImAACAgAAAAQAIAChMAACKLgEAQEAAAAEA