Minor IndexOutOfBoundsException fix

devgianlu · devgianlu · commit 5d709e229023 · 2020-05-15T18:28:05.000+02:00
diff --git a/core/src/main/java/xyz/gianlu/librespot/player/StateWrapper.java b/core/src/main/java/xyz/gianlu/librespot/player/StateWrapper.java
@@ -781,7 +781,8 @@ public List<ContextTrack> getNextTracks(boolean withQueue) {
 
     @Nullable
     public ContextTrack getCurrentTrack() {
-        return tracksKeeper == null ? null : tracksKeeper.tracks.get(tracksKeeper.getCurrentTrackIndex());
+        int index = tracksKeeper.getCurrentTrackIndex();
+        return tracksKeeper == null || tracksKeeper.tracks.size() < index ? null : tracksKeeper.tracks.get(index);
     }
 
     @NotNull

Original file line number	Diff line number	Diff line change
`@@ -781,7 +781,8 @@ public List<ContextTrack> getNextTracks(boolean withQueue) {`
`781`	`781`
`782`	`782`	`@Nullable`
`783`	`783`	`public ContextTrack getCurrentTrack() {`
`784`		`- return tracksKeeper == null ? null : tracksKeeper.tracks.get(tracksKeeper.getCurrentTrackIndex());`
	`784`	`+ int index = tracksKeeper.getCurrentTrackIndex();`
	`785`	`+ return tracksKeeper == null \|\| tracksKeeper.tracks.size() < index ? null : tracksKeeper.tracks.get(index);`
`785`	`786`	`}`
`786`	`787`
`787`	`788`	`@NotNull`