norohind/vanilla
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

fix possible endless loop

Browse Source 
We were hanging there if a user selected the previous album if:

* He already was at the first album
* And FINISH_RANDOM was enabled

The new code is somewhat simpler to read and handles the case where we hit song 0
in random mode.
This commit is contained in:
Adrian Ulrich 2017-12-04 19:53:16 +01:00
parent 2df538ccc5
commit b90cc98377
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/ch/blinkenlights/android/vanilla/SongTimeline.java
View File

@ -691,14 +691,22 @@ public final class SongTimeline {
else if (delta == SHIFT_PREVIOUS_SONG || delta == SHIFT_NEXT_SONG) { else if (delta == SHIFT_PREVIOUS_SONG || delta == SHIFT_NEXT_SONG) {
shiftCurrentSongInternal(delta); shiftCurrentSongInternal(delta);
} else { } else {
Song song = getSong(0); Song currentSong = getSong(0);
long currentAlbum = song.albumId; Song song = currentSong;
long currentSong = song.id;
delta = delta > 0 ? 1 : -1; delta = delta > 0 ? 1 : -1;
do { for (;;) {
shiftCurrentSongInternal(delta); shiftCurrentSongInternal(delta);
song = getSong(0); song = getSong(0);
} while (currentAlbum == song.albumId && currentSong != song.id);
if (currentSong == null || song == null)
break;
if (currentSong.albumId != song.albumId) // found a new album
break;
if (currentSong.id == song.id) // probably looping? (= only one album in queue)
break;
if (getPosition() == 0 && getFinishAction() == FINISH_RANDOM) // dead end: FINISH_RANDOM won't wrap around.
break;
}
} }
} }