Bug 2508 - Macros: Export2 handles channels > 2 incorrectly

src/export/Export.cpp

@@ -487,7 +487,8 @@ bool Exporter::Process(unsigned numChannels,
    mActualName = mFilename;
 
    int i = -1;
-   for (const auto &pPlugin : mPlugins) {
+   for (const auto &pPlugin : mPlugins)
+   {
       ++i;
       for (int j = 0; j < pPlugin->GetFormatCount(); j++)
       {
@@ -495,7 +496,26 @@ bool Exporter::Process(unsigned numChannels,
          {
             mFormat = i;
             mSubFormat = j;
-            return CheckFilename() && ExportTracks();
+
+            // Gather track information
+            if (!ExamineTracks())
+            {
+               return false;
+            }
+
+            // Check for down mixing
+            if (!CheckMix(false))
+            {
+               return false;
+            }
+
+            // Ensure filename doesn't interfere with project files.
+            if (!CheckFilename())
+            {
+               return false;
+            }
+
+            return ExportTracks();
          }
       }
    }