Merge branch '0.6.x'

Conflicts: NEWS configure.ac src/media_library.cpp src/playlist_editor.cpp src/tags.cpp
2014-11-06 19:23:54 +01:00
parent 309a4989c9 a32a4262b8
commit 9cb3b21d4a
9 changed files with 71 additions and 25 deletions
--- a/src/helpers.h
+++ b/src/helpers.h
@@ -87,7 +87,7 @@ inline MPD::Song *currentSong(BaseScreen *screen)
 {
 	MPD::Song *ptr = 0;
 	auto pl = proxySongList(screen);
-	if (pl)
+	if (pl && !pl.empty())
 		ptr = pl.currentSong();
 	return ptr;
 }