diff --git a/external/solanaceae_plugin b/external/solanaceae_plugin index 82cfb6d4..f7a51975 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 1c0ecf35..798d239b 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);