Fetching the calendar colors once is enough.

1 files changed, 8 insertions, 4 deletions

diff --git a/framework/src/domain/daylongeventmodel.cpp b/framework/src/domain/daylongeventmodel.cpp
index cd26b5c4..cb9769c6 100644
--- a/framework/src/domain/daylongeventmodel.cpp
+++ b/framework/src/domain/daylongeventmodel.cpp
@@ -27,7 +27,9 @@
 
 #include "entitycache.h"
 
-DayLongEventModel::DayLongEventModel(QObject *parent) : QSortFilterProxyModel(parent)
+DayLongEventModel::DayLongEventModel(QObject *parent)
+    : QSortFilterProxyModel(parent),
+    mCalendarCache{EntityCache<Calendar, Calendar::Color>::Ptr::create()}
 {
     setDynamicSortFilter(true);
 
@@ -43,8 +45,6 @@ DayLongEventModel::DayLongEventModel(QObject *parent) : QSortFilterProxyModel(pa
 
     mModel = Sink::Store::loadModel<Event>(query);
 
-    mCalendarCache = EntityCache<Calendar, Calendar::Color>::Ptr::create();
-
     setSourceModel(mModel.data());
 }
 
@@ -61,7 +61,11 @@ QHash<int, QByteArray> DayLongEventModel::roleNames() const
 
 QByteArray DayLongEventModel::getColor(const QByteArray &calendar) const
 {
-    return mCalendarCache->getProperty(calendar, "color").toByteArray();
+    const auto color = mCalendarCache->getProperty(calendar, "color").toByteArray();
+    if (color.isEmpty()) {
+        qWarning() << "Failed to get color for calendar " << calendar;
+    }
+    return color;
 }
 
 QVariant DayLongEventModel::data(const QModelIndex &idx, int role) const