aboutsummaryrefslogtreecommitdiffstats
path: root/main.c
diff options
context:
space:
mode:
Diffstat (limited to 'main.c')
-rw-r--r--main.c11
1 files changed, 9 insertions, 2 deletions
diff --git a/main.c b/main.c
index c2c29b3ac..0e3613329 100644
--- a/main.c
+++ b/main.c
@@ -11,6 +11,8 @@
#include "options.h"
#include "command.h"
#include "screen.h"
+#include "conf.h"
+
static mpd_client_t *mpc = NULL;
@@ -42,9 +44,14 @@ main(int argc, const char *argv[])
struct sigaction act;
int counter, connected;
+ /* initialize options */
+ options = options_init();
+
+ /* read configuration */
+ read_rc_file(NULL, options);
+
/* parse command line options */
- options_init();
- options = options_parse(argc, argv);
+ options_parse(argc, argv);
/* initialize local charset */
if( charset_init() )