diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2017-11-25 18:00:06 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2017-11-25 18:00:06 +0000 |
| commit | 8453224119a4c5ff7d47d9cd4924d0b1ccb99b3a (patch) | |
| tree | 15d339b62e98d5858a57aa787334e14f0e2f0ad7 /src/plugins/General/udisks2/udisks2device.cpp | |
| parent | 6fc05db7c6de9a51beba754f12ff4ac32859977d (diff) | |
| download | qmmp-8453224119a4c5ff7d47d9cd4924d0b1ccb99b3a.tar.gz qmmp-8453224119a4c5ff7d47d9cd4924d0b1ccb99b3a.tar.bz2 qmmp-8453224119a4c5ff7d47d9cd4924d0b1ccb99b3a.zip | |
copy 1.2 branch to trunk
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@7772 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src/plugins/General/udisks2/udisks2device.cpp')
| -rw-r--r-- | src/plugins/General/udisks2/udisks2device.cpp | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/plugins/General/udisks2/udisks2device.cpp b/src/plugins/General/udisks2/udisks2device.cpp index a6f4499ce..db0e88f85 100644 --- a/src/plugins/General/udisks2/udisks2device.cpp +++ b/src/plugins/General/udisks2/udisks2device.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2013 by Ilya Kotov * + * Copyright (C) 2013-2016 by Ilya Kotov * * forkotov02@ya.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -93,7 +93,10 @@ QStringList UDisks2Device::mountPoints() const foreach (QVariant arg, args) { QByteArrayList list; - arg.value<QDBusVariant>().variant().value<QDBusArgument>() >> list; + QDBusArgument a = arg.value<QDBusVariant>().variant().value<QDBusArgument>(); + if(a.currentType() != QDBusArgument::ArrayType) + continue; + a >> list; foreach (QByteArray p, list) points.append(p); @@ -103,7 +106,7 @@ QStringList UDisks2Device::mountPoints() const QString UDisks2Device::deviceFile() const { - return QString::fromAscii(m_block_interface->property("Device").toByteArray().constData()); + return QString::fromLatin1(m_block_interface->property("Device").toByteArray()); } QDBusObjectPath UDisks2Device::objectPath() const |