Tha_14/toxic
1
0
Fork 0
mirror of https://github.com/Tha14/toxic.git synced 2024-11-23 08:23:02 +01:00
Code Issues Projects Releases Wiki Activity

load data before prompt init to fix bug with prompt logging init

Browse Source
This commit is contained in:
Jfreegman 2014-04-12 03:54:43 -04:00
parent 5b3acf3f6b
commit 93d77fdeca
No known key found for this signature in database
GPG Key ID: 3627F3144076AE63
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main.c
View File

@ -524,6 +524,9 @@ int main(int argc, char *argv[])
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
if (f_loadfromfile)
load_data(m, DATA_FILE);
prompt = init_windows(m); prompt = init_windows(m);
/* create new thread for ncurses stuff */ /* create new thread for ncurses stuff */
@ -557,9 +560,6 @@ int main(int argc, char *argv[])
#endif /* _SUPPORT_AUDIO */ #endif /* _SUPPORT_AUDIO */
if (f_loadfromfile)
load_data(m, DATA_FILE);
if (f_flag == -1) { if (f_flag == -1) {
msg = "You passed '-f' without giving an argument. Defaulting to 'data' for a keyfile..."; msg = "You passed '-f' without giving an argument. Defaulting to 'data' for a keyfile...";
line_info_add(prompt, NULL, NULL, NULL, msg, SYS_MSG, 0, 0); line_info_add(prompt, NULL, NULL, NULL, msg, SYS_MSG, 0, 0);

1
src/prompt.c
View File

@ -500,7 +500,6 @@ static void prompt_onInit(ToxWindow *self, Tox *m)
} }
execute(ctx->history, self, m, "/help", GLOBAL_COMMAND_MODE); execute(ctx->history, self, m, "/help", GLOBAL_COMMAND_MODE);
wmove(ctx->history, y2-1, 2); wmove(ctx->history, y2-1, 2);
} }