X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=gui.c;h=a2d3e6cd5b63c5d867d793939dbae219196b6bab;hp=8c0da59e704a4408322b7729a2042a7f8cc0613b;hb=e5a4d6bb1e2ca7f81bc99b5d543cd5a0e5ffc693;hpb=471684761a2039bbc89aa1e3c33c62de6bef86cf

diff --git a/gui.c b/gui.c
index 8c0da59e..a2d3e6cd 100644
--- a/gui.c
+++ b/gui.c
@@ -1149,6 +1149,12 @@ static void com_ll_incr(void)
 static void com_reread_conf(void)
 {
 	char *cf =configfile_exists();
+	struct gui_cmdline_parser_params params = {
+		.override = 1,
+		.initialize = 1,
+		.check_required = 0,
+		.check_ambiguity = 0
+	};
 
 	if (!cf) {
 		PARA_WARNING_LOG("%s", "there is no configuration to read");
@@ -1156,7 +1162,7 @@ static void com_reread_conf(void)
 	}
 	PARA_INFO_LOG("%s", "rereading command line options and config file");
 	gui_cmdline_parser(_argc, _argv, &conf);
-	gui_cmdline_parser_configfile(cf, &conf, 1, 1, 0);
+	gui_cmdline_parser_config_file(cf, &conf, &params);
 	PARA_NOTICE_LOG("%s", "config file reloaded");
 	if (check_key_map_args() < 0)
 		finish(EXIT_FAILURE);
@@ -1331,8 +1337,15 @@ int main(int argc, char *argv[])
 			conf.config_file_arg);
 		exit(EXIT_FAILURE);
 	}
-	if (cf)
-		gui_cmdline_parser_configfile(cf, &conf, 0, 0, 0);
+	if (cf) {
+		struct gui_cmdline_parser_params params = {
+			.override = 0,
+			.initialize = 0,
+			.check_required = 0,
+			.check_ambiguity = 0
+		};
+		gui_cmdline_parser_config_file(cf, &conf, &params);
+	}
 	if (check_key_map_args() < 0) {
 		fprintf(stderr, "invalid key map in config file\n");
 		exit(EXIT_FAILURE);