Use Resuming instead of OnLeavingBackground

files-community · Jun 19, 2021 · 7959b8e · 7959b8e
1 parent 2734390
commit 7959b8e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git a/Files/App.xaml.cs b/Files/App.xaml.cs
@@ -80,7 +80,7 @@ public App()
             TaskScheduler.UnobservedTaskException += OnUnobservedException;
             InitializeComponent();
             Suspending += OnSuspending;
-            LeavingBackground += OnLeavingBackground;
+            Resuming += OnResuming;
 
             //LogManager.Configuration.Variables["LogPath"] = storageFolder.Path;
             AppData.FilePreviewExtensionManager.Initialize(); // The extension manager can update UI, so pass it the UI dispatcher to use for UI updates
@@ -115,7 +115,7 @@ private static async Task EnsureSettingsAndConfigurationAreBootstrapped()
             });
         }
 
-        private void OnLeavingBackground(object sender, LeavingBackgroundEventArgs e)
+        private void OnResuming(object sender, object e)
         {
             DrivesManager?.ResumeDeviceWatcher();
         }
@@ -370,15 +370,10 @@ private void OnSuspending(object sender, SuspendingEventArgs e)
             SaveSessionTabs();
 
             var deferral = e.SuspendingOperation.GetDeferral();
-            //TODO: Save application state and stop any background activity
 
-            LibraryManager?.Dispose();
             DrivesManager?.Dispose();
-            deferral.Complete();
 
-#if DEBUG
-            Current.Exit();
-#endif
+            deferral.Complete();
         }
 
         public static void SaveSessionTabs() // Enumerates through all tabs and gets the Path property and saves it to AppSettings.LastSessionPages

diff --git a/Files/Helpers/AppServiceConnectionHelper.cs b/Files/Helpers/AppServiceConnectionHelper.cs
@@ -23,10 +23,10 @@ public static class AppServiceConnectionHelper
         static AppServiceConnectionHelper()
         {
             App.Current.Suspending += OnSuspending;
-            App.Current.LeavingBackground += OnLeavingBackground;
+            App.Current.Resuming += OnResuming;
         }
 
-        private static async void OnLeavingBackground(object sender, LeavingBackgroundEventArgs e)
+        private static async void OnResuming(object sender, object e)
         {
             if (await Instance == null)
             {