Merge PR #2793: Show fallback icon on missing country flag icon

mumble-voip · Feb 3, 2017 · d871f34 · d871f34
2 parents 4886268 + 95c7b5e
commit d871f34
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/mumble/ConnectDialog.cpp b/src/mumble/ConnectDialog.cpp
@@ -435,8 +435,13 @@ QVariant ServerItem::data(int column, int role) const {
 						return loadIcon(QLatin1String("skin:emblems/emblem-favorite.svg"));
 					else if (itType == LANType)
 						return loadIcon(QLatin1String("skin:places/network-workgroup.svg"));
-					else if (! qsCountryCode.isEmpty())
+					else if (! qsCountryCode.isEmpty()) {
-						return loadIcon(QString::fromLatin1(":/flags/%1.svg").arg(qsCountryCode));
+						QString flag = QString::fromLatin1(":/flags/%1.svg").arg(qsCountryCode);
+						if (!QFileInfo::exists(flag)) {
+							flag = QLatin1String("skin:categories/applications-internet.svg");
+						}
+						return loadIcon(flag);
+					}
 					else
 						return loadIcon(QLatin1String("skin:categories/applications-internet.svg"));
 			}