1 files changed, 11 insertions, 5 deletions
diff --git a/src/main.c b/src/main.c
index 70026b1..cd92e73 100644
--- a/src/main.c
+++ b/src/main.c
@@ -636,12 +636,18 @@ int main (int argc, char **argv) {
 						BarUiMsg ("No song playing.\n");
 						break;
 					}
-					BarUiMsg ("Next songs:\n");
 					PianoSong_t *nextSong = curSong->next;
-					while (nextSong != NULL) {
-						printf ("%s -- %s\n", nextSong->artist,
-								nextSong->title);
-						nextSong = nextSong->next;
+					if (nextSong != NULL) {
+						int i = 0;
+						BarUiMsg ("Next songs:\n");
+						while (nextSong != NULL) {
+							printf ("%2i) \"%s\" by \"%s\"\n", i,
+									nextSong->title, nextSong->artist);
+							nextSong = nextSong->next;
+							i++;
+						}
+					} else {
+						BarUiMsg ("No songs in queue.\n");
 					}
 					break;