diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2012-08-05 12:08:08 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2012-08-05 12:08:08 +0000 |
| commit | 783a3684f7c86a87237921ec6655598b4b0e1932 (patch) | |
| tree | 0740458b6395e247790ce70c34d4ea9cfe6cc940 /src | |
| parent | 01017729e57e11332c285b8775d906b08406af5d (diff) | |
| download | qmmp-783a3684f7c86a87237921ec6655598b4b0e1932.tar.gz qmmp-783a3684f7c86a87237921ec6655598b4b0e1932.tar.bz2 qmmp-783a3684f7c86a87237921ec6655598b4b0e1932.zip | |
fixed bug in the directory scanner
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@2868 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src')
| -rw-r--r-- | src/qmmpui/fileloader.cpp | 9 | ||||
| -rw-r--r-- | src/qmmpui/fileloader_p.h | 2 |
2 files changed, 4 insertions, 7 deletions
diff --git a/src/qmmpui/fileloader.cpp b/src/qmmpui/fileloader.cpp index 24054ee69..4df1eec40 100644 --- a/src/qmmpui/fileloader.cpp +++ b/src/qmmpui/fileloader.cpp @@ -87,24 +87,21 @@ void FileLoader::run() void FileLoader::loadFile(const QString &path) { m_files.enqueue(path); - if(m_filters.isEmpty()) - m_filters = MetaDataManager::instance()->nameFilters(); + 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(); + 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(); + m_filters = MetaDataManager::instance()->nameFilters(); start(QThread::IdlePriority); } diff --git a/src/qmmpui/fileloader_p.h b/src/qmmpui/fileloader_p.h index 1de864c0c..a2e2a468f 100644 --- a/src/qmmpui/fileloader_p.h +++ b/src/qmmpui/fileloader_p.h @@ -52,7 +52,7 @@ public: */ ~FileLoader(); /*! - * Sets files to load + * Removes files and directories from queue and waits until thread is finished */ void finish(); /*! |
