Revert "see #751 fixed the crash (index == -1), plus added logic to prevent infoNext being returned when shuffle is on"

This reverts commit 64fa50f1cefa54e7822e5ec3f38a3940754973cd.
see #751 fixed the crash (index == -1), plus added logic to prevent infoNext being returned when shuffle is on - this time adding the right file!