[SCM] ktp-common-internals packaging branch, master, updated. debian/16.04.2-1-111-g6e00b1c

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-common-internals.git;a=commitdiff;h=294e1b9

The following commit has been merged in the master branch:
commit 294e1b91813ae6862efb834a884d41cc11e6d95e
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Wed Mar 9 17:10:33 2016 -0500

    [declarative] Guard for empty channel
    
    Reviewed-by: Alexandr Akulich <akulichalexander at gmail.com>
---
 KTp/Declarative/messages-model.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/KTp/Declarative/messages-model.cpp b/KTp/Declarative/messages-model.cpp
index 179228c..6a002d9 100644
--- a/KTp/Declarative/messages-model.cpp
+++ b/KTp/Declarative/messages-model.cpp
@@ -364,6 +364,10 @@ int MessagesModel::unreadCount() const
 
 void MessagesModel::acknowledgeAllMessages()
 {
+    if (d->textChannel.isNull()) {
+        return;
+    }
+
     QList<Tp::ReceivedMessage> queue = d->textChannel->messageQueue();
 
     d->textChannel->acknowledge(queue);

-- 
ktp-common-internals packaging