From 434e7a6a7173dcf6abe846e9972a01edce6a571b Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Wed, 17 Sep 2014 15:48:57 -0700 Subject: Fix crash at startup Not sure this is the right fix, but at least it doesn't crash any more. Signed-off-by: Dirk Hohndel --- qt-ui/models.cpp | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) (limited to 'qt-ui') diff --git a/qt-ui/models.cpp b/qt-ui/models.cpp index 162d6b482..a1813f5b1 100644 --- a/qt-ui/models.cpp +++ b/qt-ui/models.cpp @@ -2176,18 +2176,23 @@ bool TagFilterSortModel::filterAcceptsRow(int source_row, const QModelIndex &sou struct tag_entry *head = d->tag_list; if (!head) { // last tag means "Show empty tags"; - return TagFilterModel::instance()->checkState[TagFilterModel::instance()->rowCount() - 1]; + if (TagFilterModel::instance()->rowCount() > 0) + return TagFilterModel::instance()->checkState[TagFilterModel::instance()->rowCount() - 1]; + else + return true; } // have at least one tag. QStringList tagList = TagFilterModel::instance()->stringList(); - tagList.removeLast(); // remove the "Show Empty Tags"; - while (head) { - QString tagName(head->tag->name); - int index = tagList.indexOf(tagName); - if (TagFilterModel::instance()->checkState[index]) - return true; - head = head->next; + if (!tagList.isEmpty()) { + tagList.removeLast(); // remove the "Show Empty Tags"; + while (head) { + QString tagName(head->tag->name); + int index = tagList.indexOf(tagName); + if (TagFilterModel::instance()->checkState[index]) + return true; + head = head->next; + } } return false; } -- cgit v1.2.3-70-g09d2