fixed regression, fixed signals synchronization (Fixes issue 447), fixed

mplayer engine bugs


git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@2152 90c681e8-e032-0410-971d-27865f9a5e38

1 files changed, 7 insertions, 2 deletions

diff --git a/src/qmmpui/fileloader.cpp b/src/qmmpui/fileloader.cpp
index 9e48e8cfe..203d147fe 100644
--- a/src/qmmpui/fileloader.cpp
+++ b/src/qmmpui/fileloader.cpp
@@ -41,11 +41,10 @@ void FileLoader::addFile(const QString &path)
 
 void FileLoader::addDirectory(const QString& s)
 {
-    QStringList filters = MetaDataManager::instance()->nameFilters();
     QDir dir(s);
     dir.setFilter(QDir::Files | QDir::Hidden | QDir::NoSymLinks);
     dir.setSorting(QDir::Name);
-    QFileInfoList l = dir.entryInfoList(filters);
+    QFileInfoList l = dir.entryInfoList(m_filters);
     foreach(QFileInfo info, l)
     {
         addFile(info.absoluteFilePath ());
@@ -85,18 +84,24 @@ void FileLoader::run()
 void FileLoader::loadFile(const QString &path)
 {
     m_files.enqueue(path);
+    if(m_filters.isEmpty())
+        m_filters = MetaDataManager::instance()->nameFilters();
     start(QThread::IdlePriority);
 }
 
 void FileLoader::loadFiles(const QStringList &paths)
 {
     m_files << paths;
+    if(m_filters.isEmpty())
+        m_filters = MetaDataManager::instance()->nameFilters();
     start(QThread::IdlePriority);
 }
 
 void FileLoader::loadDirectory(const QString &path)
 {
     m_directories.enqueue(path);
+    if(m_filters.isEmpty())
+        m_filters = MetaDataManager::instance()->nameFilters();
     start(QThread::IdlePriority);
 }