#18

MelbourneDeveloper · Jan 6, 2019 · 338132d · 338132d
1 parent 41166e4
commit 338132d
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 22 deletions.
diff --git a/src/Device.Net/Windows/WindowsDeviceFactoryBase.cs b/src/Device.Net/Windows/WindowsDeviceFactoryBase.cs
@@ -71,7 +71,11 @@ public async Task<IEnumerable<DeviceDefinition>> GetConnectedDeviceDefinitions(u
                     if (vendorId.HasValue && !spDeviceInterfaceDetailData.DevicePath.ToLower().Contains(vendorHex)) continue;
                     if (productId.HasValue && !spDeviceInterfaceDetailData.DevicePath.ToLower().Contains(productIdHex)) continue;
 
-                    deviceDefinitions.Add(GetDeviceDefinition(spDeviceInterfaceDetailData.DevicePath));
+                    var deviceDefinition = GetDeviceDefinition(spDeviceInterfaceDetailData.DevicePath);
+
+                    if (deviceDefinition == null) continue;
+
+                    deviceDefinitions.Add(deviceDefinition);
                 }
 
                 APICalls.SetupDiDestroyDeviceInfoList(i);

diff --git a/src/Hid.Net/Windows/WindowsHidDeviceFactory.cs b/src/Hid.Net/Windows/WindowsHidDeviceFactory.cs
@@ -33,29 +33,34 @@ public IDevice GetDevice(DeviceDefinition deviceDefinition)
         #region Private Static Methods
         public static WindowsDeviceDefinition GetDeviceDefinition(string deviceId, SafeFileHandle safeFileHandle)
         {
-            var hidAttributes = GetHidAttributes(safeFileHandle);
-            var hidCollectionCapabilities = GetHidCapabilities(safeFileHandle);
-            var manufacturer = GetManufacturer(safeFileHandle);
-            var serialNumber = GetSerialNumber(safeFileHandle);
-            var product = GetProduct(safeFileHandle);
-
-            var deviceInformation = new WindowsDeviceDefinition
+            try
             {
-                DeviceId = deviceId,
-                WriteBufferSize = hidCollectionCapabilities.OutputReportByteLength,
-                ReadBufferSize = hidCollectionCapabilities.InputReportByteLength,
-                Manufacturer = manufacturer,
-                Product = product,
-                ProductId = (ushort)hidAttributes.ProductId,
-                SerialNumber = serialNumber,
-                Usage = hidCollectionCapabilities.Usage,
-                UsagePage = hidCollectionCapabilities.UsagePage,
-                VendorId = (ushort)hidAttributes.VendorId,
-                VersionNumber = (ushort)hidAttributes.VersionNumber,
-                DeviceType = DeviceType.Hid
-            };
+                var hidAttributes = GetHidAttributes(safeFileHandle);
+                var hidCollectionCapabilities = GetHidCapabilities(safeFileHandle);
+                var manufacturer = GetManufacturer(safeFileHandle);
+                var serialNumber = GetSerialNumber(safeFileHandle);
+                var product = GetProduct(safeFileHandle);
 
-            return deviceInformation;
+                return new WindowsDeviceDefinition
+                {
+                    DeviceId = deviceId,
+                    WriteBufferSize = hidCollectionCapabilities.OutputReportByteLength,
+                    ReadBufferSize = hidCollectionCapabilities.InputReportByteLength,
+                    Manufacturer = manufacturer,
+                    Product = product,
+                    ProductId = (ushort)hidAttributes.ProductId,
+                    SerialNumber = serialNumber,
+                    Usage = hidCollectionCapabilities.Usage,
+                    UsagePage = hidCollectionCapabilities.UsagePage,
+                    VendorId = (ushort)hidAttributes.VendorId,
+                    VersionNumber = (ushort)hidAttributes.VersionNumber,
+                    DeviceType = DeviceType.Hid
+                };
+            }
+            catch(Exception ex)
+            {
+                return null;
+            }
         }
         #endregion