From 5976d33fef2fd62fec5532c6e5b78ce18e3331fb Mon Sep 17 00:00:00 2001 From: Jfreegman Date: Mon, 7 Apr 2014 06:22:51 -0400 Subject: [PATCH] settings_load needs to be before init_term --- src/main.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main.c b/src/main.c index ed814f7..f193a53 100644 --- a/src/main.c +++ b/src/main.c @@ -496,15 +496,6 @@ int main(int argc, char *argv[]) free(user_config_dir); - init_term(); - Tox *m = init_tox(f_use_ipv4); - - if (m == NULL) { - endwin(); - fprintf(stderr, "Failed to initialize network. Aborting...\n"); - exit(EXIT_FAILURE); - } - /* init user_settings struct and load settings from conf file */ user_settings = malloc(sizeof(struct user_settings)); @@ -516,6 +507,15 @@ int main(int argc, char *argv[]) int settings_err = settings_load(user_settings, NULL); + init_term(); + Tox *m = init_tox(f_use_ipv4); + + if (m == NULL) { + endwin(); + fprintf(stderr, "Failed to initialize network. Aborting...\n"); + exit(EXIT_FAILURE); + } + prompt = init_windows(m); /* create new thread for ncurses stuff */