From 1ffee9933a7f8770b5eb0191bdd4da274fcb99f9 Mon Sep 17 00:00:00 2001 From: Green Sky Date: Wed, 22 May 2024 16:09:50 +0200 Subject: [PATCH] improve plugin api further --- external/solanaceae_plugin | 2 +- src/main_screen.cpp | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/external/solanaceae_plugin b/external/solanaceae_plugin index 82cfb6d..f7a5197 160000 --- a/external/solanaceae_plugin +++ b/external/solanaceae_plugin @@ -1 +1 @@ -Subproject commit 82cfb6d4920a2d6eb19e3f3560b20ec281a5fa81 +Subproject commit f7a519754d31313a5312a01a9c569edf76d15bac diff --git a/src/main_screen.cpp b/src/main_screen.cpp index 1c0ecf3..798d239 100644 --- a/src/main_screen.cpp +++ b/src/main_screen.cpp @@ -83,7 +83,9 @@ MainScreen::MainScreen(SDL_Renderer* renderer_, Theme& theme_, std::string save_ // function pointers are funky g_provideInstance("ImGuiMemAllocFunc", ImGui::GetVersion(), "host", reinterpret_cast(alloc_func)); g_provideInstance("ImGuiMemFreeFunc", ImGui::GetVersion(), "host", reinterpret_cast(free_func)); - g_provideInstance("ImGuiMemUserData", ImGui::GetVersion(), "host", user_data); + if (user_data != nullptr) { // dont register nullptrs (can be valid, we rely on the other 2 pointers to indicate) + g_provideInstance("ImGuiMemUserData", ImGui::GetVersion(), "host", user_data); + } } g_provideInstance("TextureUploaderI", "host", &sdlrtu);