avoid playing same song twice in random play mode

1 files changed, 7 insertions, 0 deletions

diff --git a/streamer.c b/streamer.c
index e5f2c238..0e690da5 100644
--- a/streamer.c
+++ b/streamer.c
@@ -506,7 +506,14 @@ streamer_move_to_randomsong (void) {
         trace ("empty playlist\n");
         return -1;
     }
+    int curr = str_get_idx_of (playing_track);
     int r = rand () / (float)RAND_MAX * cnt;
+    if (r == curr) {
+        r++;
+        if (r >= cnt) {
+            r = 0;
+        }
+    }
     streamer_set_nextsong (r, 1);
     return 0;
 }