From 76815e4416c70285eb7764d1bc0cc342cdeaeac4 Mon Sep 17 00:00:00 2001 From: "Dirk-Jan C. Binnema" Date: Sat, 9 Oct 2010 12:51:20 +0300 Subject: [PATCH] * mu-config: don't set opts->(maildir|linksdir) to NULL if it's invalid; do checking later --- src/mu-config.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/mu-config.c b/src/mu-config.c index 2beb3ff6..dfc5f8f6 100644 --- a/src/mu-config.c +++ b/src/mu-config.c @@ -94,8 +94,13 @@ set_group_index_defaults (MuConfigOptions *opts) opts->maildir = mu_util_dir_expand (opts->maildir); else opts->maildir = mu_util_guess_maildir(); - - g_free (old); + + /* note, this may be an invalid dir, but we're checking for + * validity of the dir later */ + if (!opts->maildir) + opts->maildir = old; + else + g_free (old); } @@ -142,7 +147,10 @@ set_group_find_defaults (MuConfigOptions *opts) if (opts->linksdir) { gchar *old = opts->linksdir; opts->linksdir = mu_util_dir_expand (opts->linksdir); - g_free(old); + if (!opts->linksdir) /* we'll check the dir later */ + opts->linksdir = old; + else + g_free(old); } /* FIXME: some warning when summary_len < 0? */