summaryrefslogtreecommitdiff
path: root/testing/toxic/main.c
diff options
context:
space:
mode:
authorirungentoo <irungentoo@gmail.com>2013-08-08 18:50:29 -0400
committerirungentoo <irungentoo@gmail.com>2013-08-08 18:50:29 -0400
commitff25b59fa6c714a70b1744dca2c6a8951db49c77 (patch)
treebc2fd3fcedf4041ee80a1371e3c23babe6ad7a7b /testing/toxic/main.c
parentcd730b532a628df69145bd561ab993b45010fd0f (diff)
added -n argument to toxic to disable loading keys from file (for testing)
Diffstat (limited to 'testing/toxic/main.c')
-rw-r--r--testing/toxic/main.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/testing/toxic/main.c b/testing/toxic/main.c
index 2922456e..3c5c4be7 100644
--- a/testing/toxic/main.c
+++ b/testing/toxic/main.c
@@ -354,6 +354,7 @@ int main(int argc, char *argv[])
354 char *user_config_dir = get_user_config_dir(); 354 char *user_config_dir = get_user_config_dir();
355 char *filename; 355 char *filename;
356 int config_err = create_user_config_dir(user_config_dir); 356 int config_err = create_user_config_dir(user_config_dir);
357 uint8_t loadfromfile = 1;
357 if(config_err) { 358 if(config_err) {
358 filename = "data"; 359 filename = "data";
359 } else { 360 } else {
@@ -374,13 +375,16 @@ int main(int argc, char *argv[])
374 filename = argv[i + 1]; 375 filename = argv[i + 1];
375 else 376 else
376 f_flag = -1; 377 f_flag = -1;
378 } else if (argv[i][1] == 'n') {
379 loadfromfile = 0;
377 } 380 }
378 } 381 }
379 } 382 }
380 383
381 init_term(); 384 init_term();
382 init_tox(); 385 init_tox();
383 load_data(filename); 386 if(loadfromfile)
387 load_data(filename);
384 free(filename); 388 free(filename);
385 init_windows(); 389 init_windows();
386 init_window_status(); 390 init_window_status();