diff options
author | Alvaro Soliverez <alvaro.soliverez@collabora.co.uk> | 2011-08-17 14:40:42 -0700 |
---|---|---|
committer | Alvaro Soliverez <alvaro.soliverez@collabora.co.uk> | 2011-08-17 14:40:42 -0700 |
commit | 6ca87456de62f5dfe6fc4a78e814f0f97b6e029c (patch) | |
tree | a4ba78127404f399afe6c1259597a7f6f89feed3 | |
parent | 858268e4451ea08dc861bb949244fcac377252e2 (diff) |
Fixed crash when the account requested to AvatarImageProvider is invalid
-rw-r--r-- | TelepathyQt4Yell/Models/avatar-image-provider.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/TelepathyQt4Yell/Models/avatar-image-provider.cpp b/TelepathyQt4Yell/Models/avatar-image-provider.cpp index 2ba8ff0..6f20494 100644 --- a/TelepathyQt4Yell/Models/avatar-image-provider.cpp +++ b/TelepathyQt4Yell/Models/avatar-image-provider.cpp @@ -62,9 +62,11 @@ QImage AvatarImageProvider::requestImage(const QString &id, QSize *size, const Q QString path = QString::fromLatin1(TELEPATHY_ACCOUNT_OBJECT_PATH_BASE "/") + id; Tp::AccountPtr account = mPriv->mAM->accountForPath(path); QImage image; - image.loadFromData(account->avatar().avatarData); - if (size) { - *size = image.size(); + if (!account.isNull() && account->isValid()) { + image.loadFromData(account->avatar().avatarData); + if (size) { + *size = image.size(); + } } return image; } |