From 36b25b2dd4a7f0a0045ea7f195e8083a843b538e Mon Sep 17 00:00:00 2001
From: Green Sky <green@g-s.xyz>
Date: Mon, 8 Jul 2024 18:13:24 +0200
Subject: [PATCH] big ngcft beta update

---
 external/solanaceae_ngc_ft1 | 2 +-
 external/solanaceae_util    | 2 +-
 plugins/plugin_ngcft1.cpp   | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/external/solanaceae_ngc_ft1 b/external/solanaceae_ngc_ft1
index 613b183..e5681b4 160000
--- a/external/solanaceae_ngc_ft1
+++ b/external/solanaceae_ngc_ft1
@@ -1 +1 @@
-Subproject commit 613b1835929b7f74943585593c386746ef0433d9
+Subproject commit e5681b4ad5c7f7e132852cf64315f7a4d0d80312
diff --git a/external/solanaceae_util b/external/solanaceae_util
index 6b1bb50..17d2baf 160000
--- a/external/solanaceae_util
+++ b/external/solanaceae_util
@@ -1 +1 @@
-Subproject commit 6b1bb50f169b3df6b7d2bde7b2f43543d98868f6
+Subproject commit 17d2baf7365c3499172dc5afd71171cb3a138d99
diff --git a/plugins/plugin_ngcft1.cpp b/plugins/plugin_ngcft1.cpp
index 718b7a7..81cb5af 100644
--- a/plugins/plugin_ngcft1.cpp
+++ b/plugins/plugin_ngcft1.cpp
@@ -73,8 +73,8 @@ SOLANA_PLUGIN_EXPORT void solana_plugin_stop(void) {
 
 SOLANA_PLUGIN_EXPORT float solana_plugin_tick(float delta) {
 	const float ft_interval = g_ngcft1->iterate(delta);
-	g_sha1_ngcft1->iterate(delta);
-	return ft_interval;
+	const float sha_interval = g_sha1_ngcft1->iterate(delta);
+	return std::min<float>(ft_interval, sha_interval);
 }
 
 } // extern C