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

Don't crash with no songs present

Browse Source 
I should really add an auto test for this..
This commit is contained in:
Christopher Eby 2010-03-10 22:32:46 -06:00
parent a9d1941a46
commit e8f8ff3888
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/org/kreed/vanilla/PlaybackService.java
View File

@ -157,7 +157,8 @@ public class PlaybackService extends Service implements Runnable, MediaPlayer.On
Log.d("VanillaMusic", "destroy");
saveState(true);
if (mSongs != null)
saveState(true);
if (mMediaPlayer != null) {
MediaPlayer player = mMediaPlayer;
@ -467,6 +468,9 @@ public class PlaybackService extends Service implements Runnable, MediaPlayer.On
}
Song song = getSong(0);
if (song == null)
return;
broadcastSongChange(song);
boolean cancelNotification = updateNotification();
@ -659,8 +663,11 @@ public class PlaybackService extends Service implements Runnable, MediaPlayer.On
}
if (!song.populate()) {
if (mSongs == null)
return null;
song.id = randomSong();
song.populate();
if (!song.populate())
return null;
}
return song;