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

List:       kde-commits
Subject:    [ktp-common-internals/mklapetek/SpaceBar] KTp/Declarative: [declarative] Stop the MessagesModel look
From:       Martin Klapetek <mklapetek () kde ! org>
Date:       2016-03-17 22:25:50
Message-ID: E1aggMY-0005mw-E9 () scm ! kde ! org
[Download RAW message or body]

Git commit 4e2313e66f7950d6ddc02c0fbfc9e5e28c8fd199 by Martin Klapetek.
Committed on 17/03/2016 at 22:23.
Pushed by mklapetek into branch 'mklapetek/SpaceBar'.

[declarative] Stop the MessagesModel looking for data out of bounds

M  +6    -2    KTp/Declarative/messages-model.cpp

http://commits.kde.org/telepathy-common-internals/4e2313e66f7950d6ddc02c0fbfc9e5e28c8fd199

diff --git a/KTp/Declarative/messages-model.cpp b/KTp/Declarative/messages-model.cpp
index df07e04..384275d 100644
--- a/KTp/Declarative/messages-model.cpp
+++ b/KTp/Declarative/messages-model.cpp
@@ -362,10 +362,14 @@ QVariant MessagesModel::data(const QModelIndex &index, int role) const
             result = m.deliveryReportReceiveTime;
             break;
         case PreviousMessageTypeRole:
-            result = data(createIndex(index.row() - 1, 0), TypeRole);
+            if (index.row() > 0) {
+                result = data(createIndex(index.row() - 1, 0), TypeRole);
+            }
             break;
         case NextMessageTypeRole:
-            result = data(createIndex(index.row() + 1, 0), TypeRole);
+            if (index.row() < d->messages.size() - 1) {
+                result = data(createIndex(index.row() + 1, 0), TypeRole);
+            }
             break;
         };
     } else {

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