mirror/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2026-01-11 00:04:24 +00:00
Code Activity

Error Handling: added better error report and recovery when calling EndFrame() or Render() without NewFrame().

Browse source
This commit is contained in:
ocornut 2025-04-16 18:12:53 +02:00
parent b23a216ecd
commit 7ab4728a36
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
docs/CHANGELOG.txt
View file

@ -80,6 +80,8 @@ Other changes:
CTRL+Tab windowing + pressing a keyboard key. (#8525)
- Error Handling: added better error report and recovery for extraneous
EndPopup() call. (#1651, #8499)
- Error Handling: added better error report and recovery when calling EndFrame()
or Render() without NewFrame(). Was previously only an assert.
- Fonts: word-wrapping code handle ideographic comma & full stop (U+3001, U+3002). (#8540)
- Fonts: fixed CalcWordWrapPositionA() fallback when width is too small to wrap:
would use a +1 offset instead of advancing to the next UTF-8 codepoint. (#8540)

6
imgui.cpp
View file

@ -5641,7 +5641,11 @@ void ImGui::EndFrame()
// Don't process EndFrame() multiple times.
if (g.FrameCountEnded == g.FrameCount)
return;
IM_ASSERT(g.WithinFrameScope && "Forgot to call ImGui::NewFrame()?");
if (!g.WithinFrameScope)
{
IM_ASSERT_USER_ERROR(g.WithinFrameScope, "Forgot to call ImGui::NewFrame()?");
return;
}
CallContextHooks(&g, ImGuiContextHookType_EndFramePre);