summaryrefslogtreecommitdiff
path: root/rbutil/rbutilqt/base/system.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'rbutil/rbutilqt/base/system.cpp')
-rw-r--r--rbutil/rbutilqt/base/system.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/rbutil/rbutilqt/base/system.cpp b/rbutil/rbutilqt/base/system.cpp
index 855d9e3b06..3e3f18fd81 100644
--- a/rbutil/rbutilqt/base/system.cpp
+++ b/rbutil/rbutilqt/base/system.cpp
@@ -467,9 +467,10 @@ QMap<uint32_t, QString> System::listUsbDevices(void)
467 467
468 if(buffer) { 468 if(buffer) {
469 // convert buffer text to upper case to avoid depending on the case of 469 // convert buffer text to upper case to avoid depending on the case of
470 // the keys (W7 uses different casing than XP at least). 470 // the keys (W7 uses different casing than XP at least), in addition
471 QString data = QString::fromWCharArray(buffer); 471 // XP may use "Vid_" and "Pid_".
472 QRegExp rex("USB\\\\VID_([0-9a-fA-F]{4})&PID_([0-9a-fA-F]{4}).*"); 472 QString data = QString::fromWCharArray(buffer).toUpper();
473 QRegExp rex("USB\\\\VID_([0-9A-F]{4})&PID_([0-9A-F]{4}).*");
473 if(rex.indexIn(data) >= 0) { 474 if(rex.indexIn(data) >= 0) {
474 uint32_t id; 475 uint32_t id;
475 id = rex.cap(1).toUInt(0, 16) << 16 | rex.cap(2).toUInt(0, 16); 476 id = rex.cap(1).toUInt(0, 16) << 16 | rex.cap(2).toUInt(0, 16);