Fixed a bug that could files to be added twice. Files weren't actually added two times, because we have a check for duplicate files later, but the error message for unsupported/rejected files did pop up twice!

This commit is contained in:
LoRd_MuldeR 2011-07-28 13:37:00 +02:00
parent 816e874c4c
commit ff622e29c0
3 changed files with 12 additions and 9 deletions

View File

@ -30,7 +30,7 @@
#define VER_LAMEXP_MINOR_LO 3 #define VER_LAMEXP_MINOR_LO 3
#define VER_LAMEXP_TYPE Alpha #define VER_LAMEXP_TYPE Alpha
#define VER_LAMEXP_PATCH 5 #define VER_LAMEXP_PATCH 5
#define VER_LAMEXP_BUILD 608 #define VER_LAMEXP_BUILD 610
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
// Tools versions // Tools versions

View File

@ -770,11 +770,13 @@ void MainWindow::dropEvent(QDropEvent *event)
} }
if(file.isFile()) if(file.isFile())
{ {
qDebug64("Dropped File: %1", file.canonicalFilePath());
droppedFiles << file.canonicalFilePath(); droppedFiles << file.canonicalFilePath();
continue; continue;
} }
if(file.isDir()) else if(file.isDir())
{ {
qDebug64("Dropped Folder: %1", file.canonicalFilePath());
QList<QFileInfo> list = QDir(file.canonicalFilePath()).entryInfoList(QDir::Files); QList<QFileInfo> list = QDir(file.canonicalFilePath()).entryInfoList(QDir::Files);
for(int j = 0; j < list.count(); j++) for(int j = 0; j < list.count(); j++)
{ {
@ -2838,15 +2840,17 @@ void MainWindow::addFilesDelayed(const QStringList &filePaths, bool tryASAP)
{ {
if(tryASAP && !m_delayedFileTimer->isActive()) if(tryASAP && !m_delayedFileTimer->isActive())
{ {
qDebug("Received %d files.", filePaths.count()); qDebug("Received %d file(s).", filePaths.count());
m_delayedFileList->append(filePaths); m_delayedFileList->append(filePaths);
QTimer::singleShot(0, this, SLOT(handleDelayedFiles())); QTimer::singleShot(0, this, SLOT(handleDelayedFiles()));
} }
else
m_delayedFileTimer->stop(); {
qDebug("Received %d files.", filePaths.count()); m_delayedFileTimer->stop();
m_delayedFileList->append(filePaths); qDebug("Received %d file(s).", filePaths.count());
m_delayedFileTimer->start(5000); m_delayedFileList->append(filePaths);
m_delayedFileTimer->start(5000);
}
} }
/* /*

View File

@ -77,7 +77,6 @@ void FileAnalyzer::run()
m_filesCueSheet = 0; m_filesCueSheet = 0;
m_inputFiles.sort(); m_inputFiles.sort();
m_abortFlag = false; m_abortFlag = false;
while(!m_inputFiles.isEmpty()) while(!m_inputFiles.isEmpty())