gearmulator

commit 8914bf39bed8313cbb6096d2535988bf00fa00e5
parent 734ef42fe0b1fc504734444671071f4a0ac84193
Author: dsp56300 <dsp56300@users.noreply.github.com>
Date:   Sun, 17 Nov 2024 16:51:28 +0100

fix multiple json files per skin folder no longer supported

Diffstat:
M
source/jucePluginEditorLib/pluginEditorState.cpp
 | 
6
+++---

1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/source/jucePluginEditorLib/pluginEditorState.cpp b/source/jucePluginEditorLib/pluginEditorState.cpp
@@ -187,12 +187,12 @@ void PluginEditorState::openMenu(const juce::MouseEvent* _event)
 
 	bool loadedSkinIsPartOfList = false;
 
-	std::set<std::string> knownSkinFolders;
+	std::set<std::pair<std::string, std::string>> knownSkins;	// folder, jsonFilename
 
-	auto addSkinEntry = [this, &skinMenu, &loadedSkinIsPartOfList, &knownSkinFolders](const Skin& _skin)
+	auto addSkinEntry = [this, &skinMenu, &loadedSkinIsPartOfList, &knownSkins](const Skin& _skin)
 	{
 		// remove dupes by folder
-		if(!_skin.folder.empty() && !knownSkinFolders.insert(_skin.folder).second)
+		if(!_skin.folder.empty() && !knownSkins.insert({_skin.folder, _skin.jsonFilename}).second)
 			return;
 
 		const auto isCurrent = _skin == getCurrentSkin();