Commit d20611b6 authored by Michael Pyne's avatar Michael Pyne

Merge branch 'dialog-open-every-time-2' into 'Applications/19.08'

Fix folder dialog always opens even if it is set and not empty

See merge request !11
parents 6ab21be7 98ce99c2
Pipeline #6139 passed with stage
in 7 minutes and 3 seconds
......@@ -511,11 +511,12 @@ PlaylistItemList PlaylistCollection::selectedItems()
void PlaylistCollection::scanFolders()
{
CollectionList::instance()->addFiles(m_folderList);
if(CollectionList::instance()->count() == 0)
// If no music folder was configured, open music folder dialog
if(m_folderList.count() == 0)
addFolder();
CollectionList::instance()->addFiles(m_folderList);
enableDirWatch(true);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment