release v0.29

[ncmpc.git] / src / options.c

diff --git a/src/options.c b/src/options.c
index 0a453e23a51ea403885a878782208ddac6b70506..ca6d415e41e5da28f0c08376f3039e0af189cd80 100644 (file)
--- a/src/options.c
+++ b/src/options.c
@@ -1,5 +1,5 @@
 /* ncmpc (Ncurses MPD Client)
- * (c) 2004-2010 The Music Player Daemon Project
+ * (c) 2004-2017 The Music Player Daemon Project
  * Project homepage: http://musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -61,7 +61,7 @@ options_t options = {
        .audible_bell = true,
        .bell_on_wrap = true,
        .status_message_time = 3,
-       .timeout_ms = DEFAULT_MPD_TIMEOUT,
+       .timeout_ms = 0,
 #ifndef NCMPC_MINI
        .scroll = DEFAULT_SCROLL,
        .welcome_screen_list = true,
@@ -378,14 +378,12 @@ options_init(void)
 {
        /* default option values */
        options.list_format = g_strdup(DEFAULT_LIST_FORMAT);
+       options.search_format = NULL;
        options.status_format = g_strdup(DEFAULT_STATUS_FORMAT);
        options.screen_list = g_strsplit_set(DEFAULT_SCREEN_LIST, " ", 0);
 #ifndef NCMPC_MINI
        options.scroll_sep = g_strdup(DEFAULT_SCROLL_SEP);
 #endif
-       if (getenv("MPD_TIMEOUT") != NULL)
-               /* let libmpdclient parse the environment variable */
-               options.timeout_ms = 0;
 }
 
 void
@@ -397,6 +395,7 @@ options_deinit(void)
        g_free(options.config_file);
        g_free(options.key_file);
        g_free(options.list_format);
+       g_free(options.search_format);
        g_free(options.status_format);
        g_strfreev(options.screen_list);
 #ifndef NCMPC_MINI