From 2437aa15be0f2f5cff7d8b683c3256f0e36f058f Mon Sep 17 00:00:00 2001
From: Leland Lucius <github@homerow.net>
Date: Sun, 9 Aug 2020 01:09:15 -0500
Subject: [PATCH] Bug 2491 - Reset Configuration does not reset Extended Import
 preferences

Better solution...
---
 src/menus/PluginMenus.cpp    | 4 ----
 src/prefs/ExtImportPrefs.cpp | 5 +++++
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/menus/PluginMenus.cpp b/src/menus/PluginMenus.cpp
index 96adb3683..c762c82b1 100644
--- a/src/menus/PluginMenus.cpp
+++ b/src/menus/PluginMenus.cpp
@@ -20,7 +20,6 @@
 #include "../effects/EffectManager.h"
 #include "../effects/EffectUI.h"
 #include "../effects/RealtimeEffectManager.h"
-#include "../import/Import.h"
 #include "../prefs/EffectsPrefs.h"
 #include "../prefs/PrefsDialog.h"
 
@@ -408,9 +407,6 @@ void OnResetConfig(const CommandContext &context)
    gPrefs->Write(wxT("/Version/Micro"), AUDACITY_REVISION);
 
    gPrefs->Flush();
-
-   // Bug 2491 - Reset Configuration does not reset Extended Import preferences
-   Importer::Get().ReadImportItems();
 }
 
 void OnManageGenerators(const CommandContext &context)
diff --git a/src/prefs/ExtImportPrefs.cpp b/src/prefs/ExtImportPrefs.cpp
index 8828d5706..9b020c9fb 100644
--- a/src/prefs/ExtImportPrefs.cpp
+++ b/src/prefs/ExtImportPrefs.cpp
@@ -92,6 +92,9 @@ wxString ExtImportPrefs::HelpPageName()
 /// Creates the dialog and its contents.
 void ExtImportPrefs::Populate()
 {
+   // Ensure Importer has current items
+   Importer::Get().ReadImportItems();
+
    //------------------------- Main section --------------------
    // Now construct the GUI itself.
    // Use 'eIsCreatingFromPrefs' so that the GUI is
@@ -213,6 +216,8 @@ bool ExtImportPrefs::Commit()
    ShuttleGui S(this, eIsSavingToPrefs);
    PopulateOrExchange(S);
 
+   Importer::Get().WriteImportItems();
+
    return true;
 }