From cb41a41239bd75db8a3ed6d5b3013104e393d0ad Mon Sep 17 00:00:00 2001
From: Tobias Markmann <tm@ayena.de>
Date: Fri, 30 Sep 2016 17:07:34 +0200
Subject: Only scale avatars that are not embedded Qt resources

The default avatar is a embedded SVG which doesn't need to
be scaled specifically.

Test-Information:

Builds on macOS 10.12 with Qt 5.6.1 and tooltip avatars are
still shown without an error message being logged.

Change-Id: I5aff38856e97dee9133b1daf9039cabc063dc01c

diff --git a/Swift/QtUI/QtScaledAvatarCache.cpp b/Swift/QtUI/QtScaledAvatarCache.cpp
index 8c37dac..37ea6a9 100644
--- a/Swift/QtUI/QtScaledAvatarCache.cpp
+++ b/Swift/QtUI/QtScaledAvatarCache.cpp
@@ -50,7 +50,7 @@ static QPixmap cropToBiggestCenteredSquare(const QPixmap& input) {
 
 QString QtScaledAvatarCache::getScaledAvatarPath(const QString& path) {
     QFileInfo avatarFile(path);
-    if (avatarFile.exists()) {
+    if (avatarFile.exists() && !avatarFile.absolutePath().startsWith(":/")) {
         QString cacheSubPath = QString("ScaledAvatarCacheV%1/%2").arg(QString::number(QT_SCALED_AVATAR_CACHE_VERSION), QString::number(size));
         if (!avatarFile.dir().mkpath(cacheSubPath)) {
             SWIFT_LOG(error) << "avatarFile.dir(): " << Q2PSTRING(avatarFile.dir().absolutePath()) << std::endl;
-- 
cgit v0.10.2-6-g49f6