X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=gui.c;h=ebddd88cb20b12514e249d7a8ed2dfb771df4668;hp=865ed658afc4197f4ba29ce5344be38fcbd48bad;hb=c71f51ee5d5c2a387d0ad00d842fd390ec9944d8;hpb=73d23e6bddcc4d1b6d46a31307ca56f586b541ad diff --git a/gui.c b/gui.c index 865ed658..ebddd88c 100644 --- a/gui.c +++ b/gui.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1998-2010 Andre Noll + * Copyright (C) 1998-2011 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -1394,13 +1394,8 @@ int main(int argc, char *argv[]) _argc = argc; _argv = argv; - if (gui_cmdline_parser(argc, argv, &conf)) { - fprintf(stderr, "parse error while reading command line\n"); - exit(EXIT_FAILURE); - } + gui_cmdline_parser(argc, argv, &conf); HANDLE_VERSION_FLAG("gui", conf); - init_theme(0, &theme); - top.lines = theme.top_lines_default; if (check_key_map_args() < 0) { fprintf(stderr, "invalid key map\n"); exit(EXIT_FAILURE); @@ -1425,6 +1420,8 @@ int main(int argc, char *argv[]) fprintf(stderr, "invalid key map in config file\n"); exit(EXIT_FAILURE); } + init_theme_or_die(conf.theme_arg, &theme); + top.lines = theme.top_lines_default; setup_signal_handling(); bot_win_rb = ringbuffer_new(RINGBUFFER_SIZE); initscr(); /* needed only once, always successful */