Merge pull request #66 from goodtrailer/kill-process

Desktop: Kill process if failing to close after delay
goodtrailer · Apr 30, 2023 · 2f59f48 · 2f59f48
2 parents ec25893 + 6ed78bd
commit 2f59f48
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git 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
@@ -2864,9 +2864,6 @@ New releases: https://github.com/goodtrailer/daily-desktop/releases
         5/8H24gfvKsP2DsAAAAASUVORK5CYII=
 </value>
   </data>
-  <metadata name="stateBackgroundWorker.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>158, 17</value>
-  </metadata>
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAABAA0AAAAAAAEAIACMJQAA1gAAAICAAAABACAAKAgBAGImAACAgAAAAQAIAChMAACKLgEAQEAAAAEA