lib/config: make sure the config map exists when loading defaults

[notmuch] / lib / config.cc

diff --git a/lib/config.cc b/lib/config.cc
index e502858d623db091628e4945d7736c0db2d5b2cd..8f6ef110788fe174def7c9014ad6be2cba3eff9c 100644 (file)
--- a/lib/config.cc
+++ b/lib/config.cc
@@ -435,7 +435,7 @@ _notmuch_config_load_from_file (notmuch_database_t *notmuch,
        for (gchar **keys_p = keys; *keys_p; keys_p++) {
            char *absolute_key = talloc_asprintf (notmuch, "%s.%s", *grp,  *keys_p);
            char *normalized_val;
-           val = g_key_file_get_value (file, *grp, *keys_p, NULL);
+           val = g_key_file_get_string (file, *grp, *keys_p, NULL);
            if (! val) {
                status = NOTMUCH_STATUS_FILE_ERROR;
                goto DONE;
@@ -658,6 +658,9 @@ _notmuch_config_load_defaults (notmuch_database_t *notmuch)
 {
     notmuch_config_key_t key;
 
+    if (notmuch->config == NULL)
+       notmuch->config = _notmuch_string_map_create (notmuch);
+
     for (key = NOTMUCH_CONFIG_FIRST;
         key < NOTMUCH_CONFIG_LAST;
         key = notmuch_config_key_t (key + 1)) {