Fixed issue with songs being out of queue

devgianlu · devgianlu · commit fed419f276f1 · 2019-04-23T22:20:12.000+02:00
diff --git a/core/src/main/java/xyz/gianlu/librespot/player/Player.java b/core/src/main/java/xyz/gianlu/librespot/player/Player.java
@@ -757,7 +757,7 @@ void updateContext(@NotNull Remote3Frame frame) {
                     Remote3Track track = tracks.get(i);
                     track.addToState(state);
 
-                    if (Objects.equals(trackUid, track.uri) || Objects.equals(trackUid, track.uid))
+                    if (trackUid != null && (Objects.equals(trackUid, track.uri) || Objects.equals(trackUid, track.uid)))
                         index = i;
                 }
 

Original file line number	Diff line number	Diff line change
`@@ -757,7 +757,7 @@ void updateContext(@NotNull Remote3Frame frame) {`
`757`	`757`	`Remote3Track track = tracks.get(i);`
`758`	`758`	`track.addToState(state);`
`759`	`759`
`760`		`- if (Objects.equals(trackUid, track.uri) \|\| Objects.equals(trackUid, track.uid))`
	`760`	`+ if (trackUid != null && (Objects.equals(trackUid, track.uri) \|\| Objects.equals(trackUid, track.uid)))`
`761`	`761`	`index = i;`
`762`	`762`	`}`
`763`	`763`