1 files changed, 7 insertions, 7 deletions
diff --git a/streamer.c b/streamer.c
index f067edad..b40806f3 100644
--- a/streamer.c
+++ b/streamer.c
@@ -124,20 +124,14 @@ streamer_song_removed_notify (playItem_t *it) {
 static int
 streamer_set_current (playItem_t *it) {
     int from, to;
-    streamer_buffering = 1;
     from = orig_playing_song ? pl_get_idx_of (orig_playing_song) : -1;
     to = it ? pl_get_idx_of (it) : -1;
-    if (to != -1) {
-        messagepump_push (M_TRACKCHANGED, 0, to, 0);
-    }
     if (!orig_playing_song || p_isstopped ()) {
+        streamer_buffering = 1;
         playlist_current_ptr = it;
         //trace ("from=%d, to=%d\n", from, to);
         //messagepump_push (M_SONGCHANGED, 0, from, to);
     }
-    if (from != -1) {
-        messagepump_push (M_TRACKCHANGED, 0, from, 0);
-    }
     trace ("streamer_set_current %p, buns=%d\n", it);
     if(str_streaming_song.decoder) {
         str_streaming_song.decoder->free ();
@@ -147,6 +141,12 @@ streamer_set_current (playItem_t *it) {
     if (!it) {
         goto success;
     }
+    if (to != -1) {
+        messagepump_push (M_TRACKCHANGED, 0, to, 0);
+    }
+    if (from != -1) {
+        messagepump_push (M_TRACKCHANGED, 0, from, 0);
+    }
     if (!it->decoder && it->filetype && !strcmp (it->filetype, "content")) {
         // try to get content-type
         DB_FILE *fp = streamer_file = vfs_fopen (it->fname);