Skip to content

Commit d1ce9c2

Browse files
committed
[Bundle]: GetCurrentWindow / add assert for python: Help python users against un-debuggable segfault
1 parent 75743b5 commit d1ce9c2

File tree

1 file changed

+10
-1
lines changed

1 file changed

+10
-1
lines changed

imgui_internal.h

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3391,7 +3391,16 @@ namespace ImGui
33913391
// - ImGui::NewFrame() has never been called, which is illegal.
33923392
// - You are calling ImGui functions after ImGui::EndFrame()/ImGui::Render() and before the next ImGui::NewFrame(), which is also illegal.
33933393
inline ImGuiWindow* GetCurrentWindowRead() { ImGuiContext& g = *GImGui; return g.CurrentWindow; }
3394-
inline ImGuiWindow* GetCurrentWindow() { ImGuiContext& g = *GImGui; g.CurrentWindow->WriteAccessed = true; return g.CurrentWindow; }
3394+
inline ImGuiWindow* GetCurrentWindow()
3395+
{
3396+
ImGuiContext& g = *GImGui;
3397+
#ifdef IMGUI_BUNDLE_PYTHON_API
3398+
// Help python users, because otherwise, this leads to an un-debuggable segfault
3399+
IM_ASSERT(g.CurrentWindow != NULL && "ImGui::GetCurrentWindow() -> CurrentWindow is NULL. This is likely because you are calling ImGui functions after ImGui::EndFrame()/ImGui::Render() and before the next ImGui::NewFrame().");
3400+
#endif
3401+
g.CurrentWindow->WriteAccessed = true;
3402+
return g.CurrentWindow;
3403+
}
33953404
IMGUI_API ImGuiWindow* FindWindowByID(ImGuiID id);
33963405
IMGUI_API ImGuiWindow* FindWindowByName(const char* name);
33973406
IMGUI_API void UpdateWindowParentAndRootLinks(ImGuiWindow* window, ImGuiWindowFlags flags, ImGuiWindow* parent_window);

0 commit comments

Comments
 (0)