From 938706388f2f6be89ba68ddf23d599f174ec13d6 Mon Sep 17 00:00:00 2001
From: Edric Milaret <edric.ladent-milaret@savoirfairelinux.com>
Date: Thu, 21 Jan 2016 11:09:16 -0500
Subject: [PATCH] im: fix invalid use of an ancient account
- The account pointer is null because this
account no longer exist
Change-Id: Icd5a830418de1ddbc9e77a5c8ee7c6a3d8a0f5b1
Tuleap: #257
---
src/media/textrecording.cpp | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/media/textrecording.cpp b/src/media/textrecording.cpp
index 1200d6d4..c99dd6e6 100644
--- a/src/media/textrecording.cpp
+++ b/src/media/textrecording.cpp
@@ -638,7 +638,12 @@ QVariant InstantMessagingModel::data( const QModelIndex& idx, int role) const
&& m_pRecording->call()->account()->contactMethod()->contact()) {
auto cm = m_pRecording->call()->account()->contactMethod();
return GlobalInstances::pixmapManipulator().decorationRole(cm);
- } else if (n->m_pMessage->direction == Media::Media::Direction::OUT){
+ } else if (n->m_pMessage->direction == Media::Media::Direction::OUT && n->m_pContactMethod->account()){
+ return GlobalInstances::pixmapManipulator().decorationRole(n->m_pContactMethod->account()->contactMethod());
+ } else {
+ /* It's most likely an account that doesn't exist anymore
+ * Use a fallback image in pixmapManipulator
+ */
return GlobalInstances::pixmapManipulator().decorationRole((ContactMethod*)nullptr);
}
break;
--
GitLab