Merge branch 'master' of https://github.com/rmcolbert/Cura into rmcolbert-master

This commit is contained in:
Ghostkeeper 2017-05-08 09:38:56 +02:00
commit 6f0b81d046
No known key found for this signature in database
GPG Key ID: C5F96EE2BC0F7E75

View File

@ -259,7 +259,7 @@ class USBPrinterOutputDeviceManager(QObject, OutputDevicePlugin, Extension):
i = 0
while True:
values = winreg.EnumValue(key, i)
if not only_list_usb or "USBSER" in values[0]:
if not only_list_usb or "USBSER" or "VCP" in values[0]:
base_list += [values[1]]
i += 1
except Exception as e: