Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
[nemo-qml-plugin-calendar] Always update expiryDate and creationDate …
…on event results. Contributes to JB#31152

Without events happening, expiryDate was left being undefined.
  • Loading branch information
pvuorela committed May 26, 2016
1 parent 1bc1791 commit 94f722c
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions lightweight/calendareventsmodel/calendareventsmodel.cpp
Expand Up @@ -271,8 +271,7 @@ void NemoCalendarEventsModel::getEventsResult(const QString &transactionId, cons
// events it should be there.
trackMkcal();

if ((mTransactionId != transactionId)
|| (mEventDataList.isEmpty() && eventDataList.isEmpty()))
if (mTransactionId != transactionId)
return;

int oldcount = mEventDataList.count();
Expand Down Expand Up @@ -325,8 +324,11 @@ void NemoCalendarEventsModel::getEventsResult(const QString &transactionId, cons
expiryDate.setTime(QTime(0,0,0,1));
}
}
mExpiryDate = expiryDate;
emit expiryDateChanged();

if (mExpiryDate != expiryDate) {
mExpiryDate = expiryDate;
emit expiryDateChanged();
}

endResetModel();
if (count() != oldcount) {
Expand Down

0 comments on commit 94f722c

Please sign in to comment.