Regression - remove the next track from the queue if it is the currently playing track. Fixes issue #1005

This commit is contained in:
David Sansome 2010-12-04 16:47:28 +00:00
parent a07a808e5f
commit f818577907

View File

@ -498,6 +498,10 @@ void Playlist::set_current_index(int i) {
current_item_index_ = QPersistentModelIndex(index(i, 0, QModelIndex()));
if (current_item_index_.row() == queue_->PeekNext()) {
queue_->TakeNext();
}
if (current_item_index_ == old_current)
return;
@ -522,10 +526,6 @@ void Playlist::set_current_index(int i) {
emit CurrentSongChanged(current_item_metadata());
}
if (current_item_index_.row() == queue_->PeekNext()) {
queue_->TakeNext();
}
// Update the virtual index
if (i == -1)
current_virtual_index_ = -1;