Funkwhale
/
Clementine-audio-player-Mac-Linux-Windows
mirror of https://github.com/clementine-player/Clementine
1
0
Fork 0
Code Issues Releases Wiki Activity

Map playlist indices to the source model when passing them to the future watcher for background saves, fixing a bug where the wrong notification would be sent when editing track information for the currently playing song and the playlist was filtered. Fixes issue 2063

This commit is contained in:
David Sansome 2011-08-27 23:16:57 +01:00
parent 804cbbc14e
commit a8d9f9104a
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/ui/mainwindow.cpp
View File

@ -1440,8 +1440,9 @@ void MainWindow::EditTagDialogAccepted() {
}
void MainWindow::RenumberTracks() {
QModelIndexList indexes=ui_->playlist->view()->selectionModel()->selection().indexes();
int track=1;
QModelIndexList indexes =
ui_->playlist->view()->selectionModel()->selection().indexes();
int track = 1;
// Get the index list in order
qStableSort(indexes);
@ -1458,13 +1459,14 @@ void MainWindow::RenumberTracks() {
if (index.column() != 0)
continue;
int row = playlists_->current()->proxy()->mapToSource(index).row();
const QModelIndex source_index = playlists_->current()->proxy()->mapToSource(index);
int row = source_index.row();
Song song = playlists_->current()->item_at(row)->Metadata();
if (song.IsEditable()) {
song.set_track(track);
QFuture<bool> future = song.BackgroundSave();
ModelFutureWatcher<bool>* watcher = new ModelFutureWatcher<bool>(index, this);
ModelFutureWatcher<bool>* watcher = new ModelFutureWatcher<bool>(source_index, this);
watcher->setFuture(future);
connect(watcher, SIGNAL(finished()), SLOT(SongSaveComplete()));
}
@ -1490,12 +1492,13 @@ void MainWindow::SelectionSetValue() {
if (index.column() != 0)
continue;
int row = playlists_->current()->proxy()->mapToSource(index).row();
const QModelIndex source_index = playlists_->current()->proxy()->mapToSource(index);
int row = source_index.row();
Song song = playlists_->current()->item_at(row)->Metadata();
if (Playlist::set_column_value(song, column, column_value)) {
QFuture<bool> future = song.BackgroundSave();
ModelFutureWatcher<bool>* watcher = new ModelFutureWatcher<bool>(index, this);
ModelFutureWatcher<bool>* watcher = new ModelFutureWatcher<bool>(source_index, this);
watcher->setFuture(future);
connect(watcher, SIGNAL(finished()), SLOT(SongSaveComplete()));
}