From e6f05ae46571e73c75d31f984e0270392d351b55 Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Wed, 2 Sep 2020 20:40:07 +0200 Subject: [PATCH] Make sure icon exists in GuessIconForPath --- src/device/devicelister.cpp | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/device/devicelister.cpp b/src/device/devicelister.cpp index 2ccc8cfb8..225b93f00 100644 --- a/src/device/devicelister.cpp +++ b/src/device/devicelister.cpp @@ -241,17 +241,16 @@ QStringList DeviceLister::GuessIconForPath(const QString &path) { ret << "device-ipod"; } else { - QString colour = GetIpodColour(info->ipod_model); QString model = GetIpodModel(info->ipod_model); - - if (!colour.isEmpty()) { - QString colour_icon = "multimedia-player-ipod-%1-%2"; - ret << colour_icon.arg(model, colour); - } + QString colour = GetIpodColour(info->ipod_model); if (!model.isEmpty()) { - QString model_icon = "multimedia-player-ipod-%1"; - ret << model_icon.arg(model); + QString model_icon = QString("multimedia-player-ipod-%1").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()) {