Fix crash on unreadable root drive

2023-11-03 10:42:30 +01:00
parent 17df1b45c2
commit 40df80b40f
1 changed files with 17 additions and 8 deletions
--- a/src/Providers/FileTime.Providers.Local/RootDriveInfoService.cs
+++ b/src/Providers/FileTime.Providers.Local/RootDriveInfoService.cs
@@ -61,14 +61,23 @@ public class RootDriveInfoService : IRootDriveInfoService

    private (DriveInfo Drive, IContainer? Item) GetContainer(DriveInfo rootDriveInfo)
    {
-        var task = Task.Run(
-            async () => await _localContentProvider.GetItemByNativePathAsync(
+        var container = Task.Run(
+            async () =>
+            {
+                try
+                {
+                    return await _localContentProvider.GetItemByNativePathAsync(
                        new NativePath(rootDriveInfo.RootDirectory.FullName),
-                PointInTime.Present)
-        );
-        task.Wait();
+                        PointInTime.Present);
+                }
+                catch
+                {
+                    return null;
+                }
+            }
+        ).GetAwaiter().GetResult();
        
-        return (rootDriveInfo, task.Result as IContainer);
+        return (rootDriveInfo, container as IContainer);
    }

    private static int GetDriveOrder(DriveType type)