From 30941542d3d20d411132ee58859ddc0d148aedab Mon Sep 17 00:00:00 2001
From: falkTX <falktx@falktx.com>
Date: Sun, 19 Feb 2023 19:25:57 +0100
Subject: [PATCH] Fix a few details of mini version, show mini demo patches

Signed-off-by: falkTX <falktx@falktx.com>
---
 src/CardinalUI.cpp       |  4 ++--
 src/override/MenuBar.cpp | 10 ++++------
 src/override/Scene.cpp   |  2 +-
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/CardinalUI.cpp b/src/CardinalUI.cpp
index 764cf0e..87957ee 100644
--- a/src/CardinalUI.cpp
+++ b/src/CardinalUI.cpp
@@ -347,8 +347,6 @@ public:
         rack::contextSet(context);
 
        #if CARDINAL_VARIANT_MINI
-        DISTRHO_SAFE_ASSERT(remoteUtils::connectToRemote());
-
         // create unique temporary path for this instance
         try {
             char uidBuf[24];
@@ -403,6 +401,8 @@ public:
         context->patch->loadTemplate();
         context->scene->rackScroll->reset();
 
+        DISTRHO_SAFE_ASSERT(remoteUtils::connectToRemote());
+
         Engine_setRemoteDetails(context->engine, remoteDetails);
        #endif
 
diff --git a/src/override/MenuBar.cpp b/src/override/MenuBar.cpp
index a390a34..70bb3ef 100644
--- a/src/override/MenuBar.cpp
+++ b/src/override/MenuBar.cpp
@@ -101,15 +101,16 @@ struct MenuButton : ui::Button {
 
 struct FileButton : MenuButton {
 	const bool isStandalone;
-#if ! CARDINAL_VARIANT_MINI
 	std::vector<std::string> demoPatches;
-#endif
 
 	FileButton(const bool standalone)
 		: MenuButton(),  isStandalone(standalone)
 	{
-#if ! CARDINAL_VARIANT_MINI
+#if CARDINAL_VARIANT_MINI
+		const std::string patchesDir = asset::patchesPath() + DISTRHO_OS_SEP_STR "mini";
+#else
 		const std::string patchesDir = asset::patchesPath() + DISTRHO_OS_SEP_STR "examples";
+#endif
 
 		if (system::isDirectory(patchesDir))
 		{
@@ -118,7 +119,6 @@ struct FileButton : MenuButton {
 				return string::lowercase(a) < string::lowercase(b);
 			});
 		}
-#endif
 	}
 
 	void onAction(const ActionEvent& e) override {
@@ -211,7 +211,6 @@ struct FileButton : MenuButton {
 #endif
 #endif
 
-#if ! CARDINAL_VARIANT_MINI
 		if (!demoPatches.empty())
 		{
 			menu->addChild(new ui::MenuSeparator);
@@ -237,7 +236,6 @@ struct FileButton : MenuButton {
 				}));
 			}));
 		}
-#endif
 
 #ifndef DISTRHO_OS_WASM
 		if (isStandalone) {
diff --git a/src/override/Scene.cpp b/src/override/Scene.cpp
index e8f1e77..a6802a9 100644
--- a/src/override/Scene.cpp
+++ b/src/override/Scene.cpp
@@ -218,7 +218,7 @@ void Scene::step() {
 				const std::string& name(APP->history->actions[actionIndex - 1]->name);
 				static const std::vector<std::string> ignoredNames = {
 					"move knob",
-					"move module",
+					"move modules",
 					"move switch",
 				};
 				if (std::find(ignoredNames.cbegin(), ignoredNames.cend(), name) == ignoredNames.cend()) {