main: improve strfsong() error check

[ncmpc.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 8ade659e69ddc0f997fa2bfe46a74a6754568998..a8fb3b36f654a93e4157c46baa594108dbf03153 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"
@@ -75,15 +75,19 @@ update_xterm_title(void)
        const struct mpd_song *song = mpd->song;
 
        char tmp[BUFSIZE];
+       const char *new_title = NULL;
        if (options.xterm_title_format && mpd->playing && song)
-               strfsong(tmp, BUFSIZE, options.xterm_title_format, song);
-       else
-               g_strlcpy(tmp, PACKAGE " version " VERSION, BUFSIZE);
+               new_title = strfsong(tmp, BUFSIZE, options.xterm_title_format, song) > 0
+                       ? tmp
+                       : NULL;
+
+       if (new_title == NULL)
+               new_title = PACKAGE " version " VERSION;
 
        static char title[BUFSIZE];
-       if (strncmp(title, tmp, BUFSIZE)) {
-               g_strlcpy(title, tmp, BUFSIZE);
-               set_xterm_title("%s", title);
+       if (strncmp(title, new_title, BUFSIZE)) {
+               g_strlcpy(title, new_title, BUFSIZE);
+               set_xterm_title(title);
        }
 }
 #endif
@@ -114,11 +118,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 +130,6 @@ auto_update_timer(void)
                disable_update_timer();
 }
 
-static void
-check_reconnect(void);
-
 static void
 do_mpd_update(void)
 {
@@ -147,8 +144,6 @@ do_mpd_update(void)
 
        screen_update(mpd);
        mpd->events = 0;
-
-       check_reconnect();
 }
 
 static char *
@@ -205,15 +200,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 +293,6 @@ void end_input_event(void)
        screen_update(mpd);
        mpd->events = 0;
 
-       check_reconnect();
        auto_update_timer();
 }
 
@@ -437,7 +422,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();