diff options
| author | Andrzej Rybczak <electricityispower@gmail.com> | 2014-11-06 19:23:54 +0100 |
|---|---|---|
| committer | Andrzej Rybczak <electricityispower@gmail.com> | 2014-11-06 19:23:54 +0100 |
| commit | 9cb3b21d4a1749c9c4ef2289eb116a06d646bc8f (patch) | |
| tree | ff34f2b0616c76e725d828bf3d344549cb05f5b3 /src/helpers.h | |
| parent | 309a4989c9eebb280da507f0ba396b6ea519b38e (diff) | |
| parent | a32a4262b8e458297838b111a5708a36ad970ef5 (diff) | |
Merge branch '0.6.x'
Conflicts:
NEWS
configure.ac
src/media_library.cpp
src/playlist_editor.cpp
src/tags.cpp
Diffstat (limited to 'src/helpers.h')
| -rw-r--r-- | src/helpers.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/helpers.h b/src/helpers.h index 2ea385ce..98db9510 100644 --- 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; } |