From e5ce636234bb65e786c2ff9e9c574cbda926d8de Mon Sep 17 00:00:00 2001
From: Leland Lucius <github@homerow.net>
Date: Wed, 26 Aug 2015 12:40:55 -0500
Subject: [PATCH] Fix for bug #1124

---
 src/export/ExportMultiple.cpp | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/src/export/ExportMultiple.cpp b/src/export/ExportMultiple.cpp
index 383e9be86..ed3b8afc6 100644
--- a/src/export/ExportMultiple.cpp
+++ b/src/export/ExportMultiple.cpp
@@ -217,19 +217,17 @@ int ExportMultiple::ShowModal()
 
 void ExportMultiple::PopulateOrExchange(ShuttleGui& S)
 {
-
    wxString name = mProject->GetName();
+   wxString defaultFormat = gPrefs->Read(wxT("/Export/Format"), wxT("WAV"));
 
+   wxArrayString formats;
    mPluginIndex = -1;
-
-   wxString defaultFormat = gPrefs->Read(wxT("/Export/Format"),
-      wxT("WAV"));
-
    mFilterIndex = 0;
 
    for (size_t i = 0; i < mPlugins.GetCount(); i++) {
       for (int j = 0; j < mPlugins[i]->GetFormatCount(); j++)
       {
+         formats.Add(mPlugins[i]->GetDescription(j));
          if (mPlugins[i]->GetFormat(j) == defaultFormat) {
             mPluginIndex = i;
             mSubFormatIndex = j;
@@ -244,7 +242,6 @@ void ExportMultiple::PopulateOrExchange(ShuttleGui& S)
       mSubFormatIndex = 0;
    }
 
-
    S.SetBorder(5);
    S.StartHorizontalLay(wxEXPAND, true);
    {
@@ -261,19 +258,10 @@ void ExportMultiple::PopulateOrExchange(ShuttleGui& S)
             S.Id(ChooseID).AddButton(_("Choose..."));
             S.Id(CreateID).AddButton(_("Create"));
 
-            wxArrayString formats;
-
-            for (size_t i = 0; i < mPlugins.GetCount(); i++) {
-               for (int j = 0; j < mPlugins[i]->GetFormatCount(); j++)
-               {
-                  formats.Add(mPlugins[i]->GetDescription(j));
-               }
-            }
-
             mFormat = S.Id(FormatID)
                .TieChoice(_("Format:"),
                           wxT("/Export/MultipleFormat"),
-                          mPlugins[mPluginIndex]->GetFormat(mSubFormatIndex),
+                          formats[mFilterIndex],
                           formats,
                           formats);
             S.AddVariableText(wxT(""), false);