#339 Fix two cases of drag/drop wrong next playing

1) Fix when dragging the song that is playing somewhere else continuing onto the previously next song.
2) Fix #339.  The check was correct, but the currentPlayingIndex was not being updated before doing the check.