1 files changed, 25 insertions, 5 deletions
diff --git a/src/settings-live.cpp b/src/settings-live.cpp
index f908c05..39d8e18 100644
--- a/src/settings-live.cpp
+++ b/src/settings-live.cpp
@@ -299,27 +299,47 @@ void LiveSettings::update_snooze_duration()
 
 void LiveSettings::update_cal_notification_enabled()
 {
-    cal_notification_enabled.set(g_settings_get_boolean(m_settings_cal_notification, SETTINGS_NOTIFY_ENABLED_KEY));
+    if (m_settings_cal_notification) {
+        cal_notification_enabled.set(g_settings_get_boolean(m_settings_cal_notification, SETTINGS_NOTIFY_ENABLED_KEY));
+    } else {
+        cal_notification_enabled.set(true);
+    }
 }
 
 void LiveSettings::update_cal_notification_sounds()
 {
-    cal_notification_sounds.set(g_settings_get_boolean(m_settings_cal_notification, SETTINGS_NOTIFY_SOUNDS_KEY));
+    if (m_settings_cal_notification) {
+        cal_notification_sounds.set(g_settings_get_boolean(m_settings_cal_notification, SETTINGS_NOTIFY_SOUNDS_KEY));
+    } else {
+        cal_notification_sounds.set(true);
+    }
 }
 
 void LiveSettings::update_cal_notification_vibrations()
 {
-    cal_notification_vibrations.set(g_settings_get_boolean(m_settings_cal_notification, SETTINGS_NOTIFY_VIBRATIONS_KEY));
+    if (m_settings_cal_notification) {
+        cal_notification_vibrations.set(g_settings_get_boolean(m_settings_cal_notification, SETTINGS_NOTIFY_VIBRATIONS_KEY));
+    } else {
+        cal_notification_vibrations.set(true);
+    }
 }
 
 void LiveSettings::update_cal_notification_bubbles()
 {
-    cal_notification_bubbles.set(g_settings_get_boolean(m_settings_cal_notification, SETTINGS_NOTIFY_BUBBLES_KEY));
+    if (m_settings_cal_notification) {
+        cal_notification_bubbles.set(g_settings_get_boolean(m_settings_cal_notification, SETTINGS_NOTIFY_BUBBLES_KEY));
+    } else {
+        cal_notification_bubbles.set(true);
+    }
 }
 
 void LiveSettings::update_cal_notification_list()
 {
-    cal_notification_list.set(g_settings_get_boolean(m_settings_cal_notification, SETTINGS_NOTIFY_LIST_KEY));
+    if (m_settings_cal_notification) {
+        cal_notification_list.set(g_settings_get_boolean(m_settings_cal_notification, SETTINGS_NOTIFY_LIST_KEY));
+    } else {
+        cal_notification_list.set(true);
+    }
 }
 
 /***