aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Fleischer <calcurse@cryptocrack.de>2011-07-28 12:45:29 +0200
committerLukas Fleischer <calcurse@cryptocrack.de>2011-07-28 13:36:30 +0200
commit0c4e9d3f0073092df30213bb9eb4296ec9176b19 (patch)
tree29590027b79026811b0eebeeed9e4b1753b46c81
parent34f094312fc2e9dce7621449e07f25c748039f97 (diff)
downloadcalcurse-0c4e9d3f0073092df30213bb9eb4296ec9176b19.tar.gz
calcurse-0c4e9d3f0073092df30213bb9eb4296ec9176b19.zip
Invoke vars_init() before importing data with "-i"
We forgot to call vars_init() when importing an item using the "-i" command line argument, which led to the pager configuration variable being unset and hence the pager invocation (triggered to show the log in case there are any errors during import) failing. Fix this by calling vars_init() before io_import_data(). Reported-by: Andraž 'ruskie' Levstik <ruskie@codemages.net> Signed-off-by: Lukas Fleischer <calcurse@cryptocrack.de>
-rw-r--r--src/args.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/args.c b/src/args.c
index cfa25cc..652736a 100644
--- a/src/args.c
+++ b/src/args.c
@@ -880,6 +880,8 @@ parse_args (int argc, char **argv, struct conf *conf)
{
io_check_file (path_apts, (int *)0);
io_check_file (path_todo, (int *)0);
+ /* Get default pager in case we need to show a log file. */
+ vars_init (conf);
io_load_app ();
io_load_todo ();
io_import_data (IO_IMPORT_ICAL, conf, ifile);