main: check for strfsong() failure, add fallback

[ncmpc.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 8ade659e69ddc0f997fa2bfe46a74a6754568998..72a9362e53e2cee8f3766484e32a9739765b1dfc 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -26,8 +26,8 @@
 #include "command.h"
 #include "ncu.h"
 #include "screen.h"
-#include "screen_utils.h"
 #include "screen_status.h"
+#include "xterm_title.h"
 #include "strfsong.h"
 #include "i18n.h"
 #include "player_command.h"
@@ -78,12 +78,15 @@ update_xterm_title(void)
        if (options.xterm_title_format && mpd->playing && song)
                strfsong(tmp, BUFSIZE, options.xterm_title_format, song);
        else
+               *tmp = 0;
+
+       if (*tmp == 0)
                g_strlcpy(tmp, PACKAGE " version " VERSION, BUFSIZE);
 
        static char title[BUFSIZE];
        if (strncmp(title, tmp, BUFSIZE)) {
                g_strlcpy(title, tmp, BUFSIZE);
-               set_xterm_title("%s", title);
+               set_xterm_title(title);
        }
 }
 #endif
@@ -114,11 +117,7 @@ disable_update_timer(void)
 static bool
 should_enable_update_timer(void)
 {
-       return mpd->playing
-#ifndef NCMPC_MINI
-               || options.display_time
-#endif
-               ;
+       return mpd->playing;
 }
 
 static void
@@ -130,9 +129,6 @@ auto_update_timer(void)
                disable_update_timer();
 }
 
-static void
-check_reconnect(void);
-
 static void
 do_mpd_update(void)
 {
@@ -147,8 +143,6 @@ do_mpd_update(void)
 
        screen_update(mpd);
        mpd->events = 0;
-
-       check_reconnect();
 }
 
 static char *
@@ -205,15 +199,6 @@ timer_reconnect(gcc_unused gpointer data)
        return FALSE;
 }
 
-static void
-check_reconnect(void)
-{
-       if (mpdclient_is_dead(mpd) && reconnect_source_id == 0)
-               /* reconnect when the connection is lost */
-               reconnect_source_id = g_timeout_add(1000, timer_reconnect,
-                                                   NULL);
-}
-
 void
 mpdclient_connected_callback(void)
 {
@@ -307,7 +292,6 @@ void end_input_event(void)
        screen_update(mpd);
        mpd->events = 0;
 
-       check_reconnect();
        auto_update_timer();
 }
 
@@ -437,7 +421,7 @@ main(int argc, const char *argv[])
        signals_init(main_loop, mpd);
 
        /* attempt to connect */
-       reconnect_source_id = g_timeout_add(1, timer_reconnect, NULL);
+       reconnect_source_id = g_idle_add(timer_reconnect, NULL);
 
        auto_update_timer();