diff options
author | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2014-05-24 22:56:44 +0200 |
---|---|---|
committer | Dominik Riebeling <Dominik.Riebeling@gmail.com> | 2014-05-24 22:57:25 +0200 |
commit | 896b771710c67efe69ee54e17ba2154f286917e2 (patch) | |
tree | b78f4d2747b18fdb8dbe1d267e9e613fc4614a11 /rbutil | |
parent | c03e665badb8dd5e322b6d75e77a213488e79845 (diff) | |
download | rockbox-896b771710c67efe69ee54e17ba2154f286917e2.tar.gz rockbox-896b771710c67efe69ee54e17ba2154f286917e2.zip |
Fix crash when detecting a player in MTP mode.
Change-Id: I65bf6928584735d6a179750c313fb8e7dcf7add5
Diffstat (limited to 'rbutil')
-rw-r--r-- | rbutil/rbutilqt/base/autodetection.cpp | 3 | ||||
-rw-r--r-- | rbutil/rbutilqt/changelog.txt | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/rbutil/rbutilqt/base/autodetection.cpp b/rbutil/rbutilqt/base/autodetection.cpp index 1253202e40..456d803115 100644 --- a/rbutil/rbutilqt/base/autodetection.cpp +++ b/rbutil/rbutilqt/base/autodetection.cpp | |||
@@ -85,7 +85,6 @@ void Autodetection::detectUsb() | |||
85 | // the ini file needs to hold the IDs as hex values. | 85 | // the ini file needs to hold the IDs as hex values. |
86 | QMap<int, QStringList> usbids = SystemInfo::usbIdMap(SystemInfo::MapDevice); | 86 | QMap<int, QStringList> usbids = SystemInfo::usbIdMap(SystemInfo::MapDevice); |
87 | QMap<int, QStringList> usberror = SystemInfo::usbIdMap(SystemInfo::MapError); | 87 | QMap<int, QStringList> usberror = SystemInfo::usbIdMap(SystemInfo::MapError); |
88 | QMap<int, QStringList> usbincompat = SystemInfo::usbIdMap(SystemInfo::MapIncompatible); | ||
89 | 88 | ||
90 | // usb pid detection | 89 | // usb pid detection |
91 | QList<uint32_t> attached; | 90 | QList<uint32_t> attached; |
@@ -104,7 +103,7 @@ void Autodetection::detectUsb() | |||
104 | if(usberror.contains(attached.at(i))) { | 103 | if(usberror.contains(attached.at(i))) { |
105 | struct Detected d; | 104 | struct Detected d; |
106 | d.status = PlayerMtpMode; | 105 | d.status = PlayerMtpMode; |
107 | d.device = usbids.value(attached.at(i)).at(0); | 106 | d.device = usberror.value(attached.at(i)).at(0); |
108 | m_detected.append(d); | 107 | m_detected.append(d); |
109 | LOG_WARNING() << "[USB] detected problem with player" << d.device; | 108 | LOG_WARNING() << "[USB] detected problem with player" << d.device; |
110 | } | 109 | } |
diff --git a/rbutil/rbutilqt/changelog.txt b/rbutil/rbutilqt/changelog.txt index 111bc6c73e..5e03d1e6c3 100644 --- a/rbutil/rbutilqt/changelog.txt +++ b/rbutil/rbutilqt/changelog.txt | |||
@@ -20,4 +20,5 @@ Version 1.4 | |||
20 | * Add support for Sandisk Sansa Clip Zip v01.01.21 firmware. | 20 | * Add support for Sandisk Sansa Clip Zip v01.01.21 firmware. |
21 | * Fix manual link for Archos Recorder V2. | 21 | * Fix manual link for Archos Recorder V2. |
22 | 22 | ||
23 | 23 | Version 1.4.1 | |
24 | * Fix crash on detecting player in MTP mode. | ||