From d1a2bab40072582ace264967d25c28357f0e8b24 Mon Sep 17 00:00:00 2001 From: Adrian Ulrich Date: Sat, 23 Jul 2016 15:01:28 +0200 Subject: [PATCH] fix crash introduced with 71144b1f8ee91ddc07854366a7638a25d0238a26 mCurrentPage might not be initialized when setSong() is called, so we need to check for this. --- .../android/vanilla/LibraryPagerAdapter.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/ch/blinkenlights/android/vanilla/LibraryPagerAdapter.java b/src/ch/blinkenlights/android/vanilla/LibraryPagerAdapter.java index ceb4cad2..9fbd8fca 100644 --- a/src/ch/blinkenlights/android/vanilla/LibraryPagerAdapter.java +++ b/src/ch/blinkenlights/android/vanilla/LibraryPagerAdapter.java @@ -857,15 +857,18 @@ public class LibraryPagerAdapter * @param song song that is currently playing, can be null */ public void onSongChange(Song song) { - int type = mTabOrder[mCurrentPage]; - long id = MediaUtils.getCurrentIdForType(song, type); - if (id == -1) // unknown type + if (mCurrentPage == -1) // no page active, nothing to do return; + int type = mTabOrder[mCurrentPage]; ListView view = mLists[type]; if (view == null) // not initialized yet, nothing to do return; + long id = MediaUtils.getCurrentIdForType(song, type); + if (id == -1) // unknown type + return; + // scroll to song on song change if opted-in SharedPreferences sharedPrefs = PlaybackService.getSettings(mActivity); boolean shouldScroll = sharedPrefs.getBoolean(PrefKeys.ENABLE_SCROLL_TO_SONG, PrefDefaults.ENABLE_SCROLL_TO_SONG);