From c2013fa710361a26ec5b8d5ffea9c915bba720c8 Mon Sep 17 00:00:00 2001 From: Andrzej Rybczak Date: Tue, 16 Sep 2014 12:26:30 +0200 Subject: [PATCH] actions: JumpingToPlayingSong: check if current song position is in correct range --- src/actions.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/actions.cpp b/src/actions.cpp index 9769d5fc..2da7d143 100644 --- a/src/actions.cpp +++ b/src/actions.cpp @@ -1168,7 +1168,11 @@ bool JumpToPlayingSong::canBeRun() const void JumpToPlayingSong::run() { if (myScreen == myPlaylist) - myPlaylist->main().highlight(Status::State::currentSongPosition()); + { + auto sp = Status::State::currentSongPosition(); + if (sp >= 0 && size_t(sp) < myPlaylist->main().size()) + myPlaylist->main().highlight(Status::State::currentSongPosition()); + } else if (myScreen == myBrowser) { myBrowser->LocateSong(myPlaylist->nowPlayingSong());