fix folder autoplay

diff --git a/application/player.c b/application/player.c
index a2b522d841cb9d7cb006dd98e76c63985f475b58..bed65677945a6f739cb5eae2a26949555bcded04 100644 (file)
--- a/application/player.c
+++ b/application/player.c
@@ -305,7 +305,7 @@ static void player_io(Player *p) {
                 break;
             }
             //fwrite(buf, 1, r, stdout);
                 break;
             }
             //fwrite(buf, 1, r, stdout);

-            fflush(stdout);
+            //fflush(stdout);

             json_parser_fill(js, buf, r);
             
             JSONValue *value;
             json_parser_fill(js, buf, r);
             
             JSONValue *value;

diff --git a/application/playlist.c b/application/playlist.c
index 89c276bd9a9a18bc3f60c83c29492757560bed02..206c079a08f0cd60a03269c31e25dfd99c95ad23 100644 (file)
--- a/application/playlist.c
+++ b/application/playlist.c
@@ -53,12 +53,12 @@ void PlayListPlayNext(MainWindow *win, bool force) {
         }
     } else if(win->playlist.random) {
         current = random() % len;
         }
     } else if(win->playlist.random) {
         current = random() % len;

-    } else if(current < len) {
-        current++;

     } else if(win->playlist.autoplayFolder) {
         char *next_file = util_find_next_file(win->file);
         cxListAdd(win->playlist.tracks, next_file);
         current = len;
     } else if(win->playlist.autoplayFolder) {
         char *next_file = util_find_next_file(win->file);
         cxListAdd(win->playlist.tracks, next_file);
         current = len;

+    } else if(current+1 < len) {
+        current++;

     } else {
         current = 0;
     }
     } else {
         current = 0;
     }