Fix duplicate removable drives in sidebar (#1830)

Author: gave92

Files/App.xaml.cs

@@ -79,7 +79,7 @@ private void OnLeavingBackground(object sender, LeavingBackgroundEventArgs e)
         {
             // Need to reinitialize AppService when app is resuming
             InitializeAppServiceConnection();
-            AppSettings?.DrivesManager?.StartDeviceWatcher();
+            AppSettings?.DrivesManager?.ResumeDeviceWatcher();
         }
 
         public static AppServiceConnection Connection;

Files/Filesystem/Drives.cs

@@ -30,6 +30,7 @@ public bool ShowUserConsentOnInit
         }
 
         private DeviceWatcher _deviceWatcher;
+        private bool _driveEnumInProgress;
 
         public DrivesManager()
         {
@@ -38,21 +39,23 @@ public DrivesManager()
 
         private async void EnumerateDrives()
         {
+            _driveEnumInProgress = true;
             try
             {
                 await GetDrives(Drives);
                 GetVirtualDrivesList(Drives);
                 StartDeviceWatcher();
             }
-            catch (AggregateException)
+            catch (AggregateException ex)
             {
+                Logger.Warn(ex, ex.Message);
                 ShowUserConsentOnInit = true;
             };
+            _driveEnumInProgress = false;
         }
 
-        public void StartDeviceWatcher()
+        private void StartDeviceWatcher()
         {
-            this.Dispose();
             _deviceWatcher = DeviceInformation.CreateWatcher(StorageDevice.GetDeviceSelector());
             _deviceWatcher.Added += DeviceAdded;
             _deviceWatcher.Removed += DeviceRemoved;
@@ -358,5 +361,14 @@ public void Dispose()
                 }
             }
         }
+
+        public void ResumeDeviceWatcher()
+        {
+            if (!_driveEnumInProgress)
+            {
+                this.Dispose();
+                this.StartDeviceWatcher();
+            }
+        }
     }
 }