From: Andre Noll <maan@systemlinux.org>
Date: Tue, 18 Jan 2011 20:21:48 +0000 (+0100)
Subject: gui: Check only once for invalid key maps.
X-Git-Tag: v0.4.6~39^2~6
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=481150224edabeee0a6bbfdab232df58e5c1224e;p=paraslash.git

gui: Check only once for invalid key maps.

No need to call check_key_map_args() twice.
---

diff --git a/gui.c b/gui.c
index ebddd88c..5ac1333b 100644
--- a/gui.c
+++ b/gui.c
@@ -1396,10 +1396,6 @@ int main(int argc, char *argv[])
 
 	gui_cmdline_parser(argc, argv, &conf);
 	HANDLE_VERSION_FLAG("gui", conf);
-	if (check_key_map_args() < 0) {
-		fprintf(stderr, "invalid key map\n");
-		exit(EXIT_FAILURE);
-	}
 	cf = configfile_exists();
 	if (!cf && conf.config_file_given) {
 		fprintf(stderr, "can not read config file %s\n",
@@ -1417,7 +1413,7 @@ int main(int argc, char *argv[])
 	}
 	loglevel = get_loglevel_by_name(conf.loglevel_arg);
 	if (check_key_map_args() < 0) {
-		fprintf(stderr, "invalid key map in config file\n");
+		fprintf(stderr, "invalid key map\n");
 		exit(EXIT_FAILURE);
 	}
 	init_theme_or_die(conf.theme_arg, &theme);