Skip to content

Commit 8909d6c

Browse files
authored
[Windows] Fix possible ArgumentNullException when enumerating USB devices (#445)
1 parent f6baf36 commit 8909d6c

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

windows/QMK Toolbox/Usb/UsbListener.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ private void EnumerateUsbDevices(bool connected)
2929
{
3030
var enumeratedDevices = new ManagementObjectSearcher(@"SELECT * FROM Win32_PnPEntity WHERE DeviceID LIKE 'USB%'").Get()
3131
.Cast<ManagementBaseObject>().ToList()
32-
.Where(d => ((string[])d.GetPropertyValue("HardwareID")).Any(s => UsbIdRegex.Match(s).Success));
32+
.Where(d => (d.GetPropertyValue("HardwareID") as string[])?.Any(s => UsbIdRegex.Match(s).Success) ?? false);
3333

3434
if (connected)
3535
{

0 commit comments

Comments
 (0)