Partial revert commit af67de8
This commit is contained in:
@@ -344,9 +344,10 @@ bool OrganiseDialog::SetUrls(const QList<QUrl> &urls) {
|
||||
|
||||
bool OrganiseDialog::SetFilenames(const QStringList &filenames) {
|
||||
|
||||
SetLoadingSongs(true);
|
||||
songs_future_ = QtConcurrent::run([=]{ SetSongs(LoadSongsBlocking(filenames)); });
|
||||
songs_future_ = QtConcurrent::run(this, &OrganiseDialog::LoadSongsBlocking, filenames);
|
||||
NewClosure(songs_future_, [=]() { SetSongs(songs_future_.result()); });
|
||||
|
||||
SetLoadingSongs(true);
|
||||
return true;
|
||||
|
||||
}
|
||||
|
||||
@@ -117,7 +117,7 @@ class OrganiseDialog : public QDialog {
|
||||
|
||||
OrganiseFormat format_;
|
||||
|
||||
QFuture<void> songs_future_;
|
||||
QFuture<SongList> songs_future_;
|
||||
SongList songs_;
|
||||
Organise::NewSongInfoList new_songs_info_;
|
||||
quint64 total_size_;
|
||||
|
||||
Reference in New Issue
Block a user