Fix: Fixed crash when connecting some removable drives (#15383)

gave92 · web-flow · commit 8dab1923b865 · 2024-05-12T07:22:56.000-07:00
diff --git a/src/Files.App/Utils/Global/WindowsStorageDeviceWatcher.cs b/src/Files.App/Utils/Global/WindowsStorageDeviceWatcher.cs
@@ -7,6 +7,7 @@
 using Microsoft.Extensions.Logging;
 using System;
 using System.IO;
+using System.Runtime.InteropServices;
 using Windows.Devices.Enumeration;
 using Windows.Devices.Portable;
 using Windows.Storage;
@@ -88,7 +89,7 @@ private async void Watcher_Added(DeviceWatcher sender, DeviceInformation args)
 			{
 				root = StorageDevice.FromId(deviceId);
 			}
-			catch (Exception ex) when (ex is ArgumentException or UnauthorizedAccessException)
+			catch (Exception ex) when (ex is ArgumentException or UnauthorizedAccessException or COMException)
 			{
 				App.Logger.LogWarning($"{ex.GetType()}: Attempting to add the device, {args.Name},"
 					+ $" failed at the StorageFolder initialization step. This device will be ignored. Device ID: {deviceId}");

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`	`using Microsoft.Extensions.Logging;`
`8`	`8`	`using System;`
`9`	`9`	`using System.IO;`
	`10`	`+using System.Runtime.InteropServices;`
`10`	`11`	`using Windows.Devices.Enumeration;`
`11`	`12`	`using Windows.Devices.Portable;`
`12`	`13`	`using Windows.Storage;`
`@@ -88,7 +89,7 @@ private async void Watcher_Added(DeviceWatcher sender, DeviceInformation args)`
`88`	`89`	`{`
`89`	`90`	`root = StorageDevice.FromId(deviceId);`
`90`	`91`	`}`
`91`		`- catch (Exception ex) when (ex is ArgumentException or UnauthorizedAccessException)`
	`92`	`+ catch (Exception ex) when (ex is ArgumentException or UnauthorizedAccessException or COMException)`
`92`	`93`	`{`
`93`	`94`	`App.Logger.LogWarning($"{ex.GetType()}: Attempting to add the device, {args.Name},"`
`94`	`95`	`+ $" failed at the StorageFolder initialization step. This device will be ignored. Device ID: {deviceId}");`