[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=2e9c295

The following commit has been merged in the master branch:
commit 2e9c295e71137a4ddd79edd27a700e2f289eeead
Author: Leon Handreke <leonh at ndreke.de>
Date:   Wed Oct 16 21:03:45 2013 +0100

    Fix logviewer crash with multiple conversations per date
    
    This situation commonly occurs when conversations from multiple accounts
    were held on a single day.
    
    REVIEW: 113289
    BUG: 325957
---
 logviewer/dates-model.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/logviewer/dates-model.cpp b/logviewer/dates-model.cpp
index 93f4814..db2d058 100644
--- a/logviewer/dates-model.cpp
+++ b/logviewer/dates-model.cpp
@@ -267,15 +267,15 @@ int DatesModel::rowCount(const QModelIndex &parent) const
         return m_groups.count();
     }
 
-    // Dates
+    // parent is a group, list dates
     if (parent.internalId() == -1) {
         const QDate key = m_groups.at(parent.row());
         const QList<Date*> dates = m_items.value(key);
         return dates.count();
     }
 
-    // Conversations
-    if (parent.internalId() >= 0) {
+    // parent is a date, list conversations
+    if (parent.internalId() >= 0 && parent.internalId() <= m_groups.count()) {
         const QDate key = m_groups.at(parent.parent().row());
         const QList<Date*> dates = m_items.value(key);
         const Date *date = dates.at(parent.row());
@@ -286,6 +286,7 @@ int DatesModel::rowCount(const QModelIndex &parent) const
         return date->matches.count();
     }
 
+    // parent is a conversation
     return 0;
 }
 

-- 
ktp-text-ui packaging