X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=play.c;h=9204792d0f5607a17d05a812dc83b0ff62bec49c;hp=2cb0536dfc410eae63c0484ec9bd5535a50fe5ae;hb=75feacbafa2a1fe258f85963205b8c28a976badc;hpb=e065f3eec9be99d82da855bf3da38d8e86752fef

diff --git a/play.c b/play.c
index 2cb0536d..9204792d 100644
--- a/play.c
+++ b/play.c
@@ -153,9 +153,7 @@ __noreturn static void print_help_and_die(void)
 	const char **p = d? play_args_info_detailed_help
 		: play_args_info_help;
 
-//	printf_or_die("%s\n\n", PLAY_CMDLINE_PARSER_PACKAGE "-"
-//		PLAY_CMDLINE_PARSER_VERSION);
-
+	printf_or_die("%s\n\n", VERSION_SINGLE_LINE("play"));
 	printf_or_die("%s\n\n", play_args_info_usage);
 	if (d)
 		printf_or_die("%s\n", PP_DESC);
@@ -176,12 +174,11 @@ static void parse_config_or_die(int argc, char *argv[])
 		.print_errors = 1
 	};
 
-	if (play_cmdline_parser_ext(argc, argv, &conf, &params))
-		exit(EXIT_FAILURE);
+	play_cmdline_parser_ext(argc, argv, &conf, &params);
 	HANDLE_VERSION_FLAG("play", conf);
+	loglevel = get_loglevel_by_name(conf.loglevel_arg);
 	if (conf.help_given || conf.detailed_help_given)
 		print_help_and_die();
-	loglevel = get_loglevel_by_name(conf.loglevel_arg);
 	if (conf.config_file_given)
 		config_file = para_strdup(conf.config_file_arg);
 	else {
@@ -198,6 +195,7 @@ static void parse_config_or_die(int argc, char *argv[])
 		params.initialize = 0;
 		params.check_required = 1;
 		play_cmdline_parser_config_file(config_file, &conf, &params);
+		loglevel = get_loglevel_by_name(conf.loglevel_arg);
 	}
 	for (i = 0; i < conf.key_map_given; i++) {
 		char *s = strchr(conf.key_map_arg[i] + 1, ':');