From ded81d2f864b7381a6f7dc8c7fc7ec53933e1c0d Mon Sep 17 00:00:00 2001 From: Andrey Klimenko Date: Mon, 4 Jul 2016 15:28:04 +0300 Subject: [PATCH] FIxed svace-warnings Change-Id: Iba46f1e6b13be80991bfacf845b667443d750d39 Signed-off-by: Andrey Klimenko --- src/Conversation/Main/Controller/src/Conversation.cpp | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/src/Conversation/Main/Controller/src/Conversation.cpp b/src/Conversation/Main/Controller/src/Conversation.cpp index f4c405b..64ed5de 100644 --- a/src/Conversation/Main/Controller/src/Conversation.cpp +++ b/src/Conversation/Main/Controller/src/Conversation.cpp @@ -241,8 +241,11 @@ void Conversation::setThreadId(ThreadId id, const std::string &searchWord) m_ThreadId = id; setMode(m_ThreadId.isValid() ? ConversationMode : NewMessageMode); - m_pBody->clear(); - m_pBody->setMmsRecipFlag( getMsgEngine().getStorage().hasEmail(m_ThreadId)); + if(m_pBody) + { + m_pBody->clear(); + m_pBody->setMmsRecipFlag(getMsgEngine().getStorage().hasEmail(m_ThreadId)); + } if(m_pRecipPanel) { @@ -573,6 +576,9 @@ void Conversation::convertMsgTypeHandler() void Conversation::checkAndSetMsgType() { // Body: + if(!m_pBody) + return; + bool isMms = m_pBody->isMms(); // Recipients: @@ -719,6 +725,9 @@ void Conversation::onChanged(Body &body) void Conversation::updateMsgInputPanel() { + if(!m_pBody) + return; + if(m_pBody->isMms()) { // Mms: -- 2.7.4