gui: Check only once for invalid key maps.

[paraslash.git] / gui.c

diff --git a/gui.c b/gui.c
index 8e70dd93b4d3a5d3d7b35a3c7ec65723d7639f24..5ac1333b1c55ae969bfcf29d453ceed053a5ffc6 100644 (file)
--- a/gui.c
+++ b/gui.c
@@ -1394,17 +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);
-       }
        cf = configfile_exists();
        if (!cf && conf.config_file_given) {
                fprintf(stderr, "can not read config file %s\n",
@@ -1422,9 +1413,11 @@ int main(int argc, char *argv[])
        }
        loglevel = get_loglevel_by_name(conf.loglevel_arg);
        if (check_key_map_args() < 0) {
-               fprintf(stderr, "invalid key map in config file\n");
+               fprintf(stderr, "invalid key map\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 */