aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKalle Wallin <kaw@linux.se>2004-04-14 19:00:51 +0000
committerKalle Wallin <kaw@linux.se>2004-04-14 19:00:51 +0000
commit94cdf38b7e2deed6c98a3073494a59d2be861ba2 (patch)
tree3845fd99f9f9a41efd25a7ddf9d96665b35113c4
parent67b647313985a8ee32ddd2bc4f90326048273813 (diff)
downloadmpd-94cdf38b7e2deed6c98a3073494a59d2be861ba2.tar.gz
mpd-94cdf38b7e2deed6c98a3073494a59d2be861ba2.tar.xz
mpd-94cdf38b7e2deed6c98a3073494a59d2be861ba2.zip
Check key bindings and quit if they are insane.
git-svn-id: https://svn.musicpd.org/ncmpc/trunk@753 09075e82-0dd4-0310-85a5-a0d7c8717e4f
-rw-r--r--main.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/main.c b/main.c
index 6d4bd345e..cfa1151d9 100644
--- a/main.c
+++ b/main.c
@@ -59,7 +59,14 @@ main(int argc, const char *argv[])
options = options_init();
/* read configuration */
- read_rc_file(NULL, options);
+ read_configuration(options);
+
+ /* check key bindings */
+ if( check_key_bindings() )
+ {
+ fprintf(stderr, "Confusing key bindings - exiting!\n");
+ exit(EXIT_FAILURE);
+ }
/* parse command line options */
options_parse(argc, argv);