[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [ruqola] /: Avoid crashing when we don't use rocketchataccount
From:       Laurent Montel <null () kde ! org>
Date:       2018-01-31 21:23:36
Message-ID: E1egzqy-0002ZK-CU () code ! kde ! org
[Download RAW message or body]

Git commit 9e6b77eff7be29f86c5883b8b6ab55bfb44cbc6d by Laurent Montel.
Committed on 31/01/2018 at 20:45.
Pushed by mlaurent into branch 'master'.

Avoid crashing when we don't use rocketchataccount

M  +1    -0    autotests/messagemodeltest.cpp
M  +1    -1    src/messagemodel.cpp

https://commits.kde.org/ruqola/9e6b77eff7be29f86c5883b8b6ab55bfb44cbc6d

diff --git a/autotests/messagemodeltest.cpp b/autotests/messagemodeltest.cpp
index 49cf6f4..47629d4 100644
--- a/autotests/messagemodeltest.cpp
+++ b/autotests/messagemodeltest.cpp
@@ -32,6 +32,7 @@ MessageModelTest::MessageModelTest(QObject *parent)
 
 void MessageModelTest::shouldHaveDefaultValue()
 {
+    //TODO add roqulaaccount
     MessageModel w;
     QCOMPARE(w.rowCount(), 0);
 }
diff --git a/src/messagemodel.cpp b/src/messagemodel.cpp
index 98e59f2..6eb20f1 100644
--- a/src/messagemodel.cpp
+++ b/src/messagemodel.cpp
@@ -49,7 +49,7 @@ MessageModel::MessageModel(const QString &roomID, RocketChatAccount \
*account, QO  , mRoomID(roomID)
     , mRocketChatAccount(account)
 {
-    mTextConverter = new TextConverter(mRocketChatAccount->emojiManager());
+    mTextConverter = new TextConverter(mRocketChatAccount ? \
mRocketChatAccount->emojiManager() : nullptr);  mLoadRecentHistoryManager = new \
LoadRecentHistoryManager;  qCDebug(RUQOLA_LOG) << "Creating message Model";
 #ifdef STORE_MESSAGE


[prev in list] [next in list] [prev in thread] [next in thread]