Merge branch 'master' into plugins

Conflicts:
	playlist.c

1 files changed, 1 insertions, 0 deletions

diff --git a/streamer.c b/streamer.c
index 56d86699..6476dd46 100644
--- a/streamer.c
+++ b/streamer.c
@@ -125,6 +125,7 @@ streamer_thread (uintptr_t ctx) {
             nextsong = -1;
             p_stop ();
             messagepump_push (M_SONGCHANGED, 0, pl_get_idx_of (playlist_current_ptr), -1);
+            pl_set_current (NULL);
             continue;
         }
         else if (p_isstopped ()) {