From 066344b8b0e7b107a834a3fb157e45da1b775a35 Mon Sep 17 00:00:00 2001
From: falkTX <falktx@falktx.com>
Date: Sun, 18 Sep 2022 21:57:42 +0100
Subject: [PATCH] Fix a few issues with Bidoo under Cardinal

---
 plugins/Bidoo                | 2 +-
 plugins/BidooDark/plugin.cpp | 2 +-
 src/CardinalPlugin.cpp       | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/Bidoo b/plugins/Bidoo
index 69c8a23..8610d4c 160000
--- a/plugins/Bidoo
+++ b/plugins/Bidoo
@@ -1 +1 @@
-Subproject commit 69c8a23d0182b5ef50c23b1870c354b4e30811d1
+Subproject commit 8610d4c86740d9d67ebfa4ded70279df7aeb95be
diff --git a/plugins/BidooDark/plugin.cpp b/plugins/BidooDark/plugin.cpp
index 59077fd..9e2a23d 100644
--- a/plugins/BidooDark/plugin.cpp
+++ b/plugins/BidooDark/plugin.cpp
@@ -16,7 +16,7 @@ void InstantiateExpanderItem::onAction(const event::Action &e) {
 }
 
 json_t* BidooModule::dataToJson() {
-	return nullptr;
+	return json_object();
 }
 
 void BidooModule::dataFromJson(json_t*) {
diff --git a/src/CardinalPlugin.cpp b/src/CardinalPlugin.cpp
index cfda583..f72e560 100644
--- a/src/CardinalPlugin.cpp
+++ b/src/CardinalPlugin.cpp
@@ -1202,8 +1202,6 @@ protected:
 
         DISTRHO_SAFE_ASSERT_RETURN(data.size() >= 4,);
 
-        const ScopedContext sc(this);
-
         rack::system::removeRecursively(fAutosavePath);
         rack::system::createDirectories(fAutosavePath);
 
@@ -1224,6 +1222,8 @@ protected:
             } DISTRHO_SAFE_EXCEPTION_RETURN("setState unarchiveToDirectory",);
         }
 
+        const ScopedContext sc(this);
+
         try {
             context->patch->loadAutosave();
         } DISTRHO_SAFE_EXCEPTION_RETURN("setState loadAutosave",);