"Stop After This Song" should advance the playlist before stopping

After commit 63df21d3751f25804037f56c576a14b81d0e1eb7 the playlist was
no longer advanced when the stop after this song option was chosen.
This restores the old behaviour and advances the playlist before
stopping (unless "No Playlist Advance" was also chosen or a repeat was
active).