[nemo-qml-plugin-calendar] Don't detect recurs weekly when there are …

…selected days.
sailfishos · May 14, 2020 · 04e7b64 · 04e7b64
1 parent c8c824f
commit 04e7b64
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/src/calendarutils.cpp b/src/calendarutils.cpp
@@ -47,6 +47,7 @@
 #include <QFile>
 #include <QUrl>
 #include <QString>
+#include <QBitArray>
 #include <QByteArray>
 #include <QtDebug>
 
@@ -63,9 +64,9 @@ CalendarEvent::Recur CalendarUtils::convertRecurrence(const KCalCore::Event::Ptr
 
     if (rt == KCalCore::Recurrence::rDaily && freq == 1) {
         return CalendarEvent::RecurDaily;
-    } else if (rt == KCalCore::Recurrence::rWeekly && freq == 1) {
+    } else if (rt == KCalCore::Recurrence::rWeekly && freq == 1 && event->recurrence()->days().count(true) == 0) {
         return CalendarEvent::RecurWeekly;
-    } else if (rt == KCalCore::Recurrence::rWeekly && freq == 2) {
+    } else if (rt == KCalCore::Recurrence::rWeekly && freq == 2 && event->recurrence()->days().count(true) == 0) {
         return CalendarEvent::RecurBiweekly;
     } else if (rt == KCalCore::Recurrence::rMonthlyDay && freq == 1) {
         return CalendarEvent::RecurMonthly;