dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make sure icon exists in GuessIconForPath

Browse Source
This commit is contained in:
Jonas Kvinge
2020-09-02 20:40:07 +02:00
parent a9193f9b76
commit e6f05ae465
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/device/devicelister.cpp
View File

@@ -241,17 +241,16 @@ QStringList DeviceLister::GuessIconForPath(const QString &path) {
ret << "device-ipod"; ret << "device-ipod";
} }
else { else {
QString colour = GetIpodColour(info->ipod_model);
QString model = GetIpodModel(info->ipod_model); QString model = GetIpodModel(info->ipod_model);
QString colour = GetIpodColour(info->ipod_model);
if (!colour.isEmpty()) {
QString colour_icon = "multimedia-player-ipod-%1-%2";
ret << colour_icon.arg(model, colour);
}
if (!model.isEmpty()) { if (!model.isEmpty()) {
QString model_icon = "multimedia-player-ipod-%1"; QString model_icon = QString("multimedia-player-ipod-%1").arg(model);
ret << model_icon.arg(model); if (QFile(model_icon).exists()) ret << model_icon;
if (!colour.isEmpty()) {
QString colour_icon = QString("multimedia-player-ipod-%1-%2").arg(model, colour);
if (QFile(colour_icon).exists()) ret << colour_icon;
}
} }
if (ret.isEmpty()) { if (ret.isEmpty()) {