From 17b6ca387eb34a9d1f4d7f3b5c44f6ddb3a29073 Mon Sep 17 00:00:00 2001
From: Paul Licameli <paul.licameli@audacityteam.org>
Date: Wed, 3 Jan 2018 03:00:02 -0500
Subject: [PATCH] Install plug-in by file icon context menu or drop on program
 icon...

... no longer by drop onto open program window
---
 src/Project.cpp | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/src/Project.cpp b/src/Project.cpp
index af9b6feae..47f038024 100644
--- a/src/Project.cpp
+++ b/src/Project.cpp
@@ -461,16 +461,6 @@ public:
 
          for (const auto &name : sortednames) {
 
-#ifdef EXPERIMENTAL_DRAG_DROP_PLUG_INS
-            // Is it a plug-in?
-            if (PluginManager::Get().DropFile(name)) {
-               mProject->RebuildAllMenuBars();
-               continue;
-            }
-
-            // No, so import.
-#endif
-
             if (Importer::IsMidi(name))
                AudacityProject::DoImportMIDI(mProject, name);
             else
@@ -3043,12 +3033,24 @@ void AudacityProject::OpenFile(const wxString &fileNameArg, bool addtohistory)
    // FIXME: //v Surely we could be smarter about this, like checking much earlier that this is a .aup file.
    if (temp.Mid(0, 6) != wxT("<?xml ")) {
       // If it's not XML, try opening it as any other form of audio
-      if (Importer::IsMidi(fileName))
-         DoImportMIDI(this, fileName);
-      else
-         Import(fileName);
 
-      ZoomAfterImport(nullptr);
+#ifdef EXPERIMENTAL_DRAG_DROP_PLUG_INS
+      // Is it a plug-in?
+      if (PluginManager::Get().DropFile(fileName)) {
+         this->RebuildAllMenuBars();
+      }
+      else
+      // No, so import.
+#endif
+
+      {
+         if (Importer::IsMidi(fileName))
+            DoImportMIDI(this, fileName);
+         else
+            Import(fileName);
+
+         ZoomAfterImport(nullptr);
+      }
 
       return;
    }