mirrors/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2025-10-03 08:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Viewports: DestroyContext() does not call DestroyPlatformWindows() anymore. (#7175, #8945)

Browse Source
This commit is contained in:
ocornut
2025-09-18 16:47:40 +02:00
parent 8ccff82153
commit 16b2d20115
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
docs/CHANGELOG.txt
View File

@@ -48,6 +48,9 @@ Docking+Viewports Branch:
- Nav: fixed a crash that could occur when opening a popup following the processing - Nav: fixed a crash that could occur when opening a popup following the processing
of a global shortcut while no windows were focused (the fix done in 1.92.3 was of a global shortcut while no windows were focused (the fix done in 1.92.3 was
incomplete for docking branch). incomplete for docking branch).
- Viewports: DestroyContext() does not call DestroyPlatformWindows() anymore at
it assumed to be unnecessary as backensd should have done it and we check that
backends have been shutdown since 1.90.4. Changed into asserts. (#7175, #8945)
----------------------------------------------------------------------- -----------------------------------------------------------------------

8
imgui.cpp
View File

@@ -4415,6 +4415,11 @@ void ImGui::Shutdown()
ImGuiContext& g = *GImGui; ImGuiContext& g = *GImGui;
IM_ASSERT_USER_ERROR(g.IO.BackendPlatformUserData == NULL, "Forgot to shutdown Platform backend?"); IM_ASSERT_USER_ERROR(g.IO.BackendPlatformUserData == NULL, "Forgot to shutdown Platform backend?");
IM_ASSERT_USER_ERROR(g.IO.BackendRendererUserData == NULL, "Forgot to shutdown Renderer backend?"); IM_ASSERT_USER_ERROR(g.IO.BackendRendererUserData == NULL, "Forgot to shutdown Renderer backend?");
for (ImGuiViewportP* viewport : g.Viewports)
{
IM_UNUSED(viewport);
IM_ASSERT_USER_ERROR(viewport->RendererUserData == NULL && viewport->PlatformUserData == NULL && viewport->PlatformHandle == NULL, "Backend or app forgot to call DestroyPlatformWindows()?");
}
// The fonts atlas can be used prior to calling NewFrame(), so we clear it even if g.Initialized is FALSE (which would happen if we never called NewFrame) // The fonts atlas can be used prior to calling NewFrame(), so we clear it even if g.Initialized is FALSE (which would happen if we never called NewFrame)
for (ImFontAtlas* atlas : g.FontAtlases) for (ImFontAtlas* atlas : g.FontAtlases)
@@ -4436,9 +4441,6 @@ void ImGui::Shutdown()
if (g.SettingsLoaded && g.IO.IniFilename != NULL) if (g.SettingsLoaded && g.IO.IniFilename != NULL)
SaveIniSettingsToDisk(g.IO.IniFilename); SaveIniSettingsToDisk(g.IO.IniFilename);
// Destroy platform windows
DestroyPlatformWindows();
// Shutdown extensions // Shutdown extensions
DockContextShutdown(&g); DockContextShutdown(&g);