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

fix crash during race with purge() in random mode

Browse Source
This commit is contained in:
Adrian Ulrich 2014-10-18 15:39:00 +02:00
parent 59d61ce8dd
commit 8c43b1a3c7
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -837,10 +837,14 @@ public final class SongTimeline {
*/
public void removeSongPosition(int pos) {
synchronized (this) {
ArrayList<Song> songs = mSongs;
if (songs.size() <= pos) // may happen if we race with purge()
return;
saveActiveSongs();
mSongs.remove(pos);
songs.remove(pos);
if (pos < mCurrentPos)
mCurrentPos--;
if (getSong(1) == null) // wrap around if this was the last song
@ -858,10 +862,15 @@ public final class SongTimeline {
*/
public void moveSongPosition(int from, int to) {
synchronized (this) {
ArrayList<Song> songs = mSongs;
if (songs.size() <= from || songs.size() <= to) // may happen if we race with purge()
return;
saveActiveSongs();
Song tmp = mSongs.remove(from);
mSongs.add(to, tmp);
Song tmp = songs.remove(from);
songs.add(to, tmp);
if (mCurrentPos == from) {
mCurrentPos = to; // active song was dragged to 'to'