Skip to content

fix issues with imgui backend/renderer cleanup #7278

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
notimaginative merged 1 commit into from
Mar 12, 2026
Merged

fix issues with imgui backend/renderer cleanup #7278

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions freespace2/SDLGraphicsOperations.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,13 +154,18 @@ SDLGraphicsOperations::SDLGraphicsOperations() {
}
}
SDLGraphicsOperations::~SDLGraphicsOperations() {
SDL_QuitSubSystem(SDL_INIT_VIDEO);

ImGui_ImplSDL2_Shutdown();
// make sure imgui stuff is initialized before trying to shut it down
if (ImGui::GetCurrentContext()) {
if (ImGui::GetIO().BackendPlatformUserData) {
ImGui_ImplSDL2_Shutdown();
}

if (!Cmdline_vulkan) {
ImGui_ImplOpenGL3_Shutdown();
if ( !Cmdline_vulkan && ImGui::GetIO().BackendRendererUserData ) {
ImGui_ImplOpenGL3_Shutdown();
}
}

SDL_QuitSubSystem(SDL_INIT_VIDEO);
}
std::unique_ptr<os::Viewport> SDLGraphicsOperations::createViewport(const os::ViewPortProperties& props)
{
Expand Down Expand Up @@ -267,7 +272,8 @@ std::unique_ptr<os::OpenGLContext> SDLGraphicsOperations::createOpenGLContext(os
mprintf((" Actual SDL Video values = R: %d, G: %d, B: %d, depth: %d, stencil: %d, double-buffer: %d, FSAA: %d\n",
r, g, b, depth, stencil, db, fsaa_samples));


Assertion(ImGui::GetCurrentContext() != nullptr, "Can't use ImGui without a valid context!");

ImGui_ImplSDL2_InitForOpenGL(viewport->toSDLWindow(), ctx);
ImGui_ImplOpenGL3_Init();

Expand Down
Loading