Tmp directory cleanup

Jorixon · Sep 10, 2023 · 5263dd0 · 5263dd0
1 parent f9f25d6
commit 5263dd0
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/src/GIMI-ModManager.Core/Services/SkinManagerService.cs b/src/GIMI-ModManager.Core/Services/SkinManagerService.cs
@@ -493,7 +493,7 @@ public async Task<string> GetCurrentSwapVariationAsync(Guid characterSkinEntryId
 
     public void Dispose()
     {
-        _userIniWatcher.Dispose();
+        _userIniWatcher?.Dispose();
     }
 }
 

diff --git a/src/GIMI-ModManager.WinUI/Services/ActivationService.cs b/src/GIMI-ModManager.WinUI/Services/ActivationService.cs
@@ -70,6 +70,9 @@ public async Task ActivateAsync(object activationArgs)
         // Activate the MainWindow.
         App.MainWindow.Activate();
 
+        // Set MainWindow Cleanup on Close.
+        App.MainWindow.Closed += (_, _) => OnApplicationExit();
+
         // Execute tasks after activation.
         await StartupAsync();
     }
@@ -172,4 +175,16 @@ private void ScreenSizeSavingTimer_Tick(object sender, object e)
             .SaveSettingAsync(ScreenSize.Key, new ScreenSize(width, height) { IsFullScreen = isFullScreen }));
         _timer?.Stop();
     }
+
+
+    private void OnApplicationExit()
+    {
+        _logger.Debug("JASM shutting down...");
+        _updateChecker.Dispose();
+        var tmpDir = new DirectoryInfo(App.TMP_DIR);
+        if (!tmpDir.Exists) return;
+
+        _logger.Debug("Deleting temporary directory: {Path}", tmpDir.FullName);
+        tmpDir.Delete(true);
+    }
 }