Code

command.c: put curly braces around a single large statement
[ncmpc.git] / src / screen_lyrics.c
index a71b932b6544d46b7a5b7b16496aa771b19f9dcb..e655fc5f37c1fcb53e2ce79d62b9c4be3aa0bb67 100644 (file)
@@ -278,9 +278,10 @@ lyrics_open(struct mpdclient *c)
                    mpd_song_get_uri(current.song)) != 0))
                screen_lyrics_load(next_song_c);
 
-       if (next_song != NULL)
+       if (next_song != NULL) {
                mpd_song_free(next_song);
-       next_song = NULL;
+               next_song = NULL;
+       }
 }
 
 static void
@@ -312,9 +313,12 @@ lyrics_title(char *str, size_t size)
                n = snprintf(str, size, "%s: %s - %s",
                             _("Lyrics"),
                             current.artist, current.title);
-               if (options.lyrics_show_plugin && current.plugin_name != NULL)
+
+               if (options.lyrics_show_plugin && current.plugin_name != NULL &&
+                   (unsigned int) n < size - 1)
                        snprintf(str + n, size - n, " (%s)",
                                 current.plugin_name);
+
                return str;
        } else
                return _("Lyrics");