From c7efda7da83e9fb682e39240bec3fcda2b2dfa3b Mon Sep 17 00:00:00 2001
From: Matt Nadareski <mnadareski@outlook.com>
Date: Thu, 9 Mar 2023 09:10:29 -0500
Subject: [PATCH] Move drive finding inside of the try/catch

---
 CHANGELIST.md          |  1 +
 MPF.Core/Data/Drive.cs | 18 +++++++++---------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/CHANGELIST.md b/CHANGELIST.md
index 8c284ba6..207c83b3 100644
--- a/CHANGELIST.md
+++ b/CHANGELIST.md
@@ -82,6 +82,7 @@
 - Add `win7-x64` to identifier list
 - Remove unsupported identifiers
 - Add identifiers in more places
+- Move drive finding inside of the try/catch
 
 ### 2.4 (2022-10-26)
 
diff --git a/MPF.Core/Data/Drive.cs b/MPF.Core/Data/Drive.cs
index 89ab01c7..659c0765 100644
--- a/MPF.Core/Data/Drive.cs
+++ b/MPF.Core/Data/Drive.cs
@@ -604,14 +604,14 @@ namespace MPF.Core.Data
             // TODO: Reduce reliance on `DriveInfo`
             // https://github.com/aaru-dps/Aaru/blob/5164a154e2145941472f2ee0aeb2eff3338ecbb3/Aaru.Devices/Windows/ListDevices.cs#L66
 
-            // Get all supported drive types
-            var drives = DriveInfo.GetDrives()
-                .Where(d => desiredDriveTypes.Contains(d.DriveType))
-                .Select(d => Create(EnumConverter.ToInternalDriveType(d.DriveType), d.Name))
-                .ToList();
-
             try
             {
+                // Get all supported drive types
+                var drives = DriveInfo.GetDrives()
+                    .Where(d => desiredDriveTypes.Contains(d.DriveType))
+                    .Select(d => Create(EnumConverter.ToInternalDriveType(d.DriveType), d.Name))
+                    .ToList();
+
                 CimSession session = CimSession.Create(null);
                 var collection = session.QueryInstances("root\\CIMV2", "WQL", "SELECT * FROM Win32_LogicalDisk");
 
@@ -625,13 +625,13 @@ namespace MPF.Core.Data
                         drives.ForEach(d => { if (d.Letter == devId) { d.InternalDriveType = Data.InternalDriveType.Floppy; } });
                     }
                 }
+
+                return drives;
             }
             catch
             {
-                // No-op
+                return new List<Drive>();
             }
-
-            return drives;
         }
 
         #endregion