gui: Allow selecting a startup theme.

[paraslash.git] / gui.c

diff --git a/gui.c b/gui.c
index 8e70dd93b4d3a5d3d7b35a3c7ec65723d7639f24..5b25c51bee99fa5ad3707a72fa012e4479983dee 100644 (file)
--- a/gui.c
+++ b/gui.c
@@ -1399,8 +1399,6 @@ int main(int argc, char *argv[])
                exit(EXIT_FAILURE);
        }
        HANDLE_VERSION_FLAG("gui", conf);
                exit(EXIT_FAILURE);
        }
        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);
        if (check_key_map_args() < 0) {
                fprintf(stderr, "invalid key map\n");
                exit(EXIT_FAILURE);


@@ -1425,6 +1423,8 @@ int main(int argc, char *argv[])
                fprintf(stderr, "invalid key map in config file\n");
                exit(EXIT_FAILURE);
        }
                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 */
        setup_signal_handling();
        bot_win_rb = ringbuffer_new(RINGBUFFER_SIZE);
        initscr(); /* needed only once, always successful */