Do not add the files directly in the Drag&Drop event routine. Instead only remember...

diff --git a/etc/Translation/Blank.ts b/etc/Translation/Blank.ts
index 4043174..eab0e32 100644 (file)
--- a/etc/Translation/Blank.ts
+++ b/etc/Translation/Blank.ts
@@ -1382,203 +1382,203 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Add file(s)</source>
+        <source>Load Translation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Add Folder</source>
+        <source>Translation Files</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Load Translation</source>
+        <source>Do you really want to disable the update reminder?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Translation Files</source>
+        <source>Yes</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>New Folder</source>
+        <source>No</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enter the name of the new folder:</source>
+        <source>The update reminder has been disabled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Failed to create folder</source>
+        <source>Please remember to check for updates at regular intervals!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The new folder could not be created:</source>
+        <source>The update reminder has been re-enabled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Drive is read-only or insufficient access rights!</source>
+        <source>Do you really want to disable all sound effects?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Already Running</source>
+        <source>Sound Effects</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>LameXP is already running, please use the running instance!</source>
+        <source>All sound effects have been disabled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Quality Level %1</source>
+        <source>The sound effects have been re-enabled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Compression %1</source>
+        <source>Nero AAC Notifications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Uncompressed</source>
+        <source>Do you really want to disable all Nero AAC Encoder notifications?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Best Quality (Very Slow)</source>
+        <source>All Nero AAC Encoder notifications have been disabled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>High Quality (Recommended)</source>
+        <source>The Nero AAC Encoder notifications have been re-enabled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Average Quality (Default)</source>
+        <source>WMA Decoder Notifications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Low Quality (Fast)</source>
+        <source>Do you really want to disable all WMA Decoder notifications?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Poor Quality (Very Fast)</source>
+        <source>All WMA Decoder notifications have been disabled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>%1 Instance(s)</source>
+        <source>The WMA Decoder notifications have been re-enabled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Cannot write to the selected directory. Please choose another directory!</source>
+        <source>Open Cue Sheet</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Do you really want to disable the update reminder?</source>
+        <source>Cue Sheet File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Yes</source>
+        <source>Beta Updates</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>No</source>
+        <source>Do you really want LameXP to check for Beta (pre-release) updates?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The update reminder has been disabled.</source>
+        <source>LameXP will check for Beta (pre-release) updates from now on.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Please remember to check for updates at regular intervals!</source>
+        <source>Check Now</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The update reminder has been re-enabled.</source>
+        <source>LameXP will &lt;i&gt;not&lt;/i&gt; check for Beta (pre-release) updates from now on.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Do you really want to disable all sound effects?</source>
+        <source>Shell Integration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sound Effects</source>
+        <source>Do you really want to disable the LameXP shell integration?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>All sound effects have been disabled.</source>
+        <source>The LameXP shell integration has been disabled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The sound effects have been re-enabled.</source>
+        <source>The LameXP shell integration has been re-enabled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Nero AAC Notifications</source>
+        <source>Add file(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Do you really want to disable all Nero AAC Encoder notifications?</source>
+        <source>Add Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>All Nero AAC Encoder notifications have been disabled.</source>
+        <source>New Folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The Nero AAC Encoder notifications have been re-enabled.</source>
+        <source>Enter the name of the new folder:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>WMA Decoder Notifications</source>
+        <source>Failed to create folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Do you really want to disable all WMA Decoder notifications?</source>
+        <source>The new folder could not be created:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>All WMA Decoder notifications have been disabled.</source>
+        <source>Drive is read-only or insufficient access rights!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The WMA Decoder notifications have been re-enabled.</source>
+        <source>Quality Level %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Open Cue Sheet</source>
+        <source>Compression %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Cue Sheet File</source>
+        <source>Uncompressed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Beta Updates</source>
+        <source>Best Quality (Very Slow)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Do you really want LameXP to check for Beta (pre-release) updates?</source>
+        <source>High Quality (Recommended)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>LameXP will check for Beta (pre-release) updates from now on.</source>
+        <source>Average Quality (Default)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Check Now</source>
+        <source>Low Quality (Fast)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>LameXP will &lt;i&gt;not&lt;/i&gt; check for Beta (pre-release) updates from now on.</source>
+        <source>Poor Quality (Very Fast)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Shell Integration</source>
+        <source>%1 Instance(s)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Do you really want to disable the LameXP shell integration?</source>
+        <source>Cannot write to the selected directory. Please choose another directory!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The LameXP shell integration has been disabled.</source>
+        <source>Already Running</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>The LameXP shell integration has been re-enabled.</source>
+        <source>LameXP is already running, please use the running instance!</source>
         <translation type="unfinished"></translation>
     </message>
 </context>

diff --git a/etc/Translation/update.lst b/etc/Translation/update.lst
index 7552340..314672a 100644 (file)
--- a/etc/Translation/update.lst
+++ b/etc/Translation/update.lst
@@ -12,6 +12,7 @@
 ..\..\src\Decoder_AC3.cpp 
 ..\..\src\Decoder_ADPCM.cpp 
 ..\..\src\Decoder_ALAC.cpp 
+..\..\src\Decoder_Avisynth.cpp 
 ..\..\src\Decoder_FLAC.cpp 
 ..\..\src\Decoder_MAC.cpp 
 ..\..\src\Decoder_MP3.cpp 
@@ -75,6 +76,7 @@
 ..\..\src\Decoder_AC3.h 
 ..\..\src\Decoder_ADPCM.h 
 ..\..\src\Decoder_ALAC.h 
+..\..\src\Decoder_Avisynth.h 
 ..\..\src\Decoder_FLAC.h 
 ..\..\src\Decoder_MAC.h 
 ..\..\src\Decoder_MP3.h 

diff --git a/src/Config.h b/src/Config.h
index 2f07dd1..8eee8b6 100644 (file)
--- a/src/Config.h
+++ b/src/Config.h
@@ -30,7 +30,7 @@
 #define VER_LAMEXP_MINOR_LO                                    2
 #define VER_LAMEXP_TYPE                                                Beta
 #define VER_LAMEXP_PATCH                                       4
-#define VER_LAMEXP_BUILD                                       550
+#define VER_LAMEXP_BUILD                                       552
 
 ///////////////////////////////////////////////////////////////////////////////
 // Tools versions

diff --git a/src/Dialog_MainWindow.cpp b/src/Dialog_MainWindow.cpp
index 4b8a342..9979cbe 100644 (file)
--- a/src/Dialog_MainWindow.cpp
+++ b/src/Dialog_MainWindow.cpp
@@ -377,6 +377,8 @@ MainWindow::MainWindow(FileListModel *fileListModel, AudioFileModel *metaInfo, S
        m_messageHandler = new MessageHandlerThread();
        m_delayedFileList = new QStringList();
        m_delayedFileTimer = new QTimer();
+       m_delayedFileTimer->setSingleShot(true);
+       m_delayedFileTimer->setInterval(5000);
        connect(m_messageHandler, SIGNAL(otherInstanceDetected()), this, SLOT(notifyOtherInstance()), Qt::QueuedConnection);
        connect(m_messageHandler, SIGNAL(fileReceived(QString)), this, SLOT(addFileDelayed(QString)), Qt::QueuedConnection);
        connect(m_messageHandler, SIGNAL(killSignalReceived()), this, SLOT(close()), Qt::QueuedConnection);
@@ -768,7 +770,11 @@ void MainWindow::dropEvent(QDropEvent *event)
                }
        }
        
-       addFiles(droppedFiles);
+       if(!droppedFiles.isEmpty())
+       {
+               m_delayedFileList->append(droppedFiles);
+               QTimer::singleShot(0, this, SLOT(handleDelayedFiles()));
+       }
 }
 
 /*