Merge branch 'reminder' into 'master'

[mkcal] Properly save alarm when using 0 offset. Fixes TJC#219642 See merge request mer-core/mkcal!33
sailfishos · Jan 3, 2020 · f20c086 · f20c086
2 parents 65a681c + dcf44d3
commit f20c086
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/sqliteformat.cpp b/src/sqliteformat.cpp
@@ -753,14 +753,14 @@ bool SqliteFormat::Private::modifyAlarm(int rowid, Alarm::Ptr alarm,
             sqlite3_bind_int(stmt, index, 0);
         }
 
-        if (alarm->startOffset().value()) {
+        if (alarm->hasStartOffset()) {
             sqlite3_bind_int(stmt, index, alarm->startOffset().asSeconds());
             relation = QString("startTriggerRelation").toUtf8();
             sqlite3_bind_text(stmt, index, relation.constData(), relation.length(), SQLITE_STATIC);
             sqlite3_bind_int(stmt, index, 0); // time
             sqlite3_bind_int(stmt, index, 0); // localtime
             sqlite3_bind_text(stmt, index, "", 0, SQLITE_STATIC);
-        } else if (alarm->endOffset().value()) {
+        } else if (alarm->hasEndOffset()) {
             sqlite3_bind_int(stmt, index, alarm->endOffset().asSeconds());
             relation = QString("endTriggerRelation").toUtf8();
             sqlite3_bind_text(stmt, index, relation.constData(), relation.length(), SQLITE_STATIC);