From f89f540fb14f0a3e93fef112463c6e22a4e2aecd Mon Sep 17 00:00:00 2001
From: LRN1986 <LRN1986@47890b92-0858-11df-a26f-8b716316a5bc>
Date: Wed, 21 Apr 2010 13:42:51 +0000
Subject: [PATCH] Don't discard override filter with default rule. Don't
 override it with MP3 if a file is mp3

---
 src/import/Import.cpp | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/import/Import.cpp b/src/import/Import.cpp
index 59d2e706d..5f19ecf9a 100644
--- a/src/import/Import.cpp
+++ b/src/import/Import.cpp
@@ -418,7 +418,8 @@ int Importer::Import(wxString fName,
    if (!foundItem || (usersSelectionOverrides && !foundOverride))
    {
       bool prioritizeMp3 = false;
-      importPlugins.Clear();
+      if (usersSelectionOverrides && !foundOverride)
+         importPlugins.Clear();
       wxLogMessage(wxT("Applying default rule"));
       // Special treatment for mp3 files
       if (wxMatchWild (wxT("*.mp3"),fName.Lower(), false))
@@ -438,8 +439,16 @@ int Importer::Import(wxString fName,
             }
             else if (prioritizeMp3)
             {
-               wxLogMessage(wxT("Inserting %s at 0"),plugin->GetPluginStringID().c_str());
-               importPlugins.Insert((size_t) 0, plugin);
+               if (usersSelectionOverrides)
+               {
+                  wxLogMessage(wxT("Inserting %s at 1"),plugin->GetPluginStringID().c_str());
+                  importPlugins.Insert((size_t) 1, plugin);
+               }
+               else
+               {
+                  wxLogMessage(wxT("Inserting %s at 0"),plugin->GetPluginStringID().c_str());
+                  importPlugins.Insert((size_t) 0, plugin);
+               }
             }
          }
          importPluginNode = importPluginNode->GetNext();