summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDominik Riebeling <Dominik.Riebeling@gmail.com>2014-05-24 22:56:44 +0200
committerDominik Riebeling <Dominik.Riebeling@gmail.com>2014-05-24 22:57:25 +0200
commit896b771710c67efe69ee54e17ba2154f286917e2 (patch)
treeb78f4d2747b18fdb8dbe1d267e9e613fc4614a11
parentc03e665badb8dd5e322b6d75e77a213488e79845 (diff)
downloadrockbox-896b771710c67efe69ee54e17ba2154f286917e2.tar.gz
rockbox-896b771710c67efe69ee54e17ba2154f286917e2.tar.bz2
rockbox-896b771710c67efe69ee54e17ba2154f286917e2.zip
Fix crash when detecting a player in MTP mode.
Change-Id: I65bf6928584735d6a179750c313fb8e7dcf7add5
-rw-r--r--rbutil/rbutilqt/base/autodetection.cpp3
-rw-r--r--rbutil/rbutilqt/changelog.txt3
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()
// the ini file needs to hold the IDs as hex values.
QMap<int, QStringList> usbids = SystemInfo::usbIdMap(SystemInfo::MapDevice);
QMap<int, QStringList> usberror = SystemInfo::usbIdMap(SystemInfo::MapError);
- QMap<int, QStringList> usbincompat = SystemInfo::usbIdMap(SystemInfo::MapIncompatible);
// usb pid detection
QList<uint32_t> attached;
@@ -104,7 +103,7 @@ void Autodetection::detectUsb()
if(usberror.contains(attached.at(i))) {
struct Detected d;
d.status = PlayerMtpMode;
- d.device = usbids.value(attached.at(i)).at(0);
+ d.device = usberror.value(attached.at(i)).at(0);
m_detected.append(d);
LOG_WARNING() << "[USB] detected problem with player" << d.device;
}
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
* Add support for Sandisk Sansa Clip Zip v01.01.21 firmware.
* Fix manual link for Archos Recorder V2.
-
+Version 1.4.1
+* Fix crash on detecting player in MTP mode.