From 850cf3e035b36aa6266105ed0fe8913b4514efb8 Mon Sep 17 00:00:00 2001
From: Robin Gareus <robin@gareus.org>
Date: Tue, 4 Apr 2023 14:00:46 +0200
Subject: [PATCH] Add vst3/win debug messages to investigate #9273

---
 libs/ardour/plugin_manager.cc | 6 ++++++
 libs/ardour/vst3_scan.cc      | 5 ++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/libs/ardour/plugin_manager.cc b/libs/ardour/plugin_manager.cc
index 464ce601a9..9e5e343f8f 100644
--- a/libs/ardour/plugin_manager.cc
+++ b/libs/ardour/plugin_manager.cc
@@ -2067,6 +2067,7 @@ PluginManager::vst3_discover_from_path (string const& path, bool cache_only)
 	size_t n = 1;
 	size_t all_modules = plugin_objects.size ();
 	for (vector<string>::iterator i = plugin_objects.begin(); i != plugin_objects.end (); ++i, ++n) {
+		DEBUG_TRACE (DEBUG::PluginManager, string_compose ("VST3: discover '%1'\n", *i));
 		reset_scan_cancel_state (true);
 		ARDOUR::PluginScanMessage (string_compose (_("VST3 (%1 / %2)"), n, all_modules), *i, !cache_only && !cancelled());
 		vst3_discover (*i, cache_only || cancelled ());
@@ -2116,6 +2117,11 @@ PluginManager::vst3_discover (string const& path, bool cache_only)
 		return -1;
 	}
 
+	/* ignore - e.g. .vst3 DLL inside .vst3 bundle */
+	if (module_path == "-1") {
+		return -1;
+	}
+
 	PSLEPtr psle (scan_log_entry (VST3, path));
 
 	if (vst3_is_blacklisted (module_path)) {
diff --git a/libs/ardour/vst3_scan.cc b/libs/ardour/vst3_scan.cc
index d55a230c78..fa19a54d35 100644
--- a/libs/ardour/vst3_scan.cc
+++ b/libs/ardour/vst3_scan.cc
@@ -307,7 +307,10 @@ ARDOUR::module_path_vst3 (string const& path)
 			/* Ignore *.vst3 dll if it resides inside a bundle with the same name.
 			 * Ardour will instead use the bundle.
 			 */
-			return "";
+#ifndef NDEBUG
+		cerr << "Ignore .vst3 file inside bundle '" << path << "'\n";
+#endif
+			return "-1";
 		}
 #endif
 		module_path = path;