From eaa8705a909f12092c7ba3e5695fba70f5bcb535 Mon Sep 17 00:00:00 2001 From: scribam Date: Wed, 4 Sep 2024 19:36:53 +0200 Subject: [PATCH] imgui: free cursors for all backends --- vita3k/gui/src/imgui_impl_sdl.cpp | 3 +++ vita3k/gui/src/imgui_impl_sdl_gl3.cpp | 5 ----- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/vita3k/gui/src/imgui_impl_sdl.cpp b/vita3k/gui/src/imgui_impl_sdl.cpp index 5c943b8de0..80be23a470 100644 --- a/vita3k/gui/src/imgui_impl_sdl.cpp +++ b/vita3k/gui/src/imgui_impl_sdl.cpp @@ -123,6 +123,9 @@ IMGUI_API void ImGui_ImplSdl_Shutdown(ImGui_State *state) { default: LOG_ERROR("Missing ImGui init for backend {}.", static_cast(state->renderer->current_backend)); } + + for (ImGuiMouseCursor cursor_n = 0; cursor_n < ImGuiMouseCursor_COUNT; cursor_n++) + SDL_FreeCursor(state->mouse_cursors[cursor_n]); } IMGUI_API void ImGui_ImplSdl_NewFrame(ImGui_State *state) { ImGuiIO &io = ImGui::GetIO(); diff --git a/vita3k/gui/src/imgui_impl_sdl_gl3.cpp b/vita3k/gui/src/imgui_impl_sdl_gl3.cpp index 7311482657..d68f68562f 100644 --- a/vita3k/gui/src/imgui_impl_sdl_gl3.cpp +++ b/vita3k/gui/src/imgui_impl_sdl_gl3.cpp @@ -340,11 +340,6 @@ IMGUI_API ImGui_GLState *ImGui_ImplSdlGL3_Init(renderer::State *renderer, SDL_Wi } void ImGui_ImplSdlGL3_Shutdown(ImGui_GLState &state) { - // Destroy SDL mouse cursors - for (auto &mouse_cursor : state.mouse_cursors) - SDL_FreeCursor(mouse_cursor); - memset(state.mouse_cursors, 0, sizeof(state.mouse_cursors)); - // Destroy OpenGL objects ImGui_ImplSdlGL3_InvalidateDeviceObjects(state); }