From b652ad9568051cd2e4f115af869c083e8aba8377 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sun, 26 Nov 2017 11:55:31 +0100 Subject: [PATCH] queue/Playlist: cast next_song to bool, because that is all we need in SyncWithPlayer() --- src/queue/Playlist.cxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/queue/Playlist.cxx b/src/queue/Playlist.cxx index dfeb0d163..8cdcc9a74 100644 --- a/src/queue/Playlist.cxx +++ b/src/queue/Playlist.cxx @@ -178,7 +178,7 @@ playlist::SyncWithPlayer(PlayerControl &pc) pc.Lock(); const PlayerState pc_state = pc.GetState(); - const DetachedSong *pc_next_song = pc.next_song; + bool pc_has_next_song = pc.next_song != nullptr; pc.Unlock(); if (pc_state == PlayerState::STOP) @@ -190,16 +190,16 @@ playlist::SyncWithPlayer(PlayerControl &pc) else { /* check if the player thread has already started playing the queued song */ - if (pc_next_song == nullptr && queued != -1) + if (!pc_has_next_song && queued != -1) QueuedSongStarted(pc); pc.Lock(); - pc_next_song = pc.next_song; + pc_has_next_song = pc.next_song != nullptr; pc.Unlock(); /* make sure the queued song is always set (if possible) */ - if (pc_next_song == nullptr && queued < 0) + if (!pc_has_next_song && queued < 0) UpdateQueuedSong(pc, nullptr); } }