Merge pull request #75 from NuiCpp/devel

Bug Fixes and More Tests
NuiCpp · Sep 20, 2023 · 35209fe · 35209fe
2 parents 1e1ee1a + 81b96ac
commit 35209fe
Show file tree

Hide file tree

Showing 14 changed files with 1,011 additions and 64 deletions.
diff --git a/nui/include/nui/backend/rpc_hub.hpp b/nui/include/nui/backend/rpc_hub.hpp
@@ -4,6 +4,7 @@
 #include <nui/data_structures/selectables_registry.hpp>
 #include <nui/utility/meta/function_traits.hpp>
 #include <nui/utility/meta/pick_first.hpp>
+#include <nui/shared/on_destroy.hpp>
 #include <nlohmann/json.hpp>
 #include <fmt/format.h>
 
@@ -96,6 +97,22 @@ namespace Nui
             }})();
         )";
 
+        struct AutoUnregister : public OnDestroy
+        {
+            AutoUnregister(RpcHub const* hub, std::string name)
+                : OnDestroy{[hub, name = std::move(name)]() {
+                    hub->unregisterFunction(name);
+                }}
+            {}
+        };
+
+        template <typename T>
+        AutoUnregister autoRegisterFunction(std::string const& name, T&& func) const
+        {
+            registerFunction(name, std::forward<T>(func));
+            return AutoUnregister{this, name};
+        }
+
         template <typename T>
         void registerFunction(std::string const& name, T&& func) const
         {