Fallback to device-ipod for ipod icon name

This commit is contained in:
Jonas Kvinge
2020-09-02 19:36:47 +02:00
parent ebab9b7e4a
commit e373a17cd3

View File

@@ -237,6 +237,10 @@ QStringList DeviceLister::GuessIconForPath(const QString &path) {
itdb_device_set_mountpoint(device, path.toLocal8Bit().constData()); itdb_device_set_mountpoint(device, path.toLocal8Bit().constData());
const Itdb_IpodInfo* info = itdb_device_get_ipod_info(device); const Itdb_IpodInfo* info = itdb_device_get_ipod_info(device);
if (info->ipod_model == ITDB_IPOD_MODEL_INVALID) {
ret << "device-ipod";
}
else {
QString colour = GetIpodColour(info->ipod_model); QString colour = GetIpodColour(info->ipod_model);
QString model = GetIpodModel(info->ipod_model); QString model = GetIpodModel(info->ipod_model);
@@ -251,6 +255,13 @@ QStringList DeviceLister::GuessIconForPath(const QString &path) {
QString model_icon = "multimedia-player-ipod-%1"; QString model_icon = "multimedia-player-ipod-%1";
ret << model_icon.arg(model); ret << model_icon.arg(model);
} }
if (ret.isEmpty()) {
ret << "device-ipod";
}
}
} }
#else #else
Q_UNUSED(path) Q_UNUSED(path)