From: Kalle Wallin <kaw@linux.se>
Date: Wed, 14 Apr 2004 19:00:51 +0000 (+0000)
Subject: Check key bindings and quit if they are insane.
X-Git-Tag: v0.12_alpha1~593
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=94cdf38b7e2deed6c98a3073494a59d2be861ba2;p=ncmpc.git

Check key bindings and quit if they are insane.


git-svn-id: https://svn.musicpd.org/ncmpc/trunk@753 09075e82-0dd4-0310-85a5-a0d7c8717e4f
---

diff --git a/main.c b/main.c
index 6d4bd34..cfa1151 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);