Skip to content

Commit 63ab70f

Browse files
committed
[Bundle]: GetCurrentWindow / add assert for python: Help python users against un-debuggable segfault
1 parent 55b82e1 commit 63ab70f

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
@@ -3224,7 +3224,16 @@ namespace ImGui
32243224
IMGUI_API ImGuiIO& GetIOEx(ImGuiContext* ctx);
32253225
IMGUI_API ImGuiPlatformIO& GetPlatformIOEx(ImGuiContext* ctx);
32263226
inline ImGuiWindow* GetCurrentWindowRead() { ImGuiContext& g = *GImGui; return g.CurrentWindow; }
3227-
inline ImGuiWindow* GetCurrentWindow() { ImGuiContext& g = *GImGui; g.CurrentWindow->WriteAccessed = true; return g.CurrentWindow; }
3227+
inline ImGuiWindow* GetCurrentWindow()
3228+
{
3229+
ImGuiContext& g = *GImGui;
3230+
#ifdef IMGUI_BUNDLE_PYTHON_API
3231+
// Help python users, because otherwise, this leads to an un-debuggable segfault
3232+
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().");
3233+
#endif
3234+
g.CurrentWindow->WriteAccessed = true;
3235+
return g.CurrentWindow;
3236+
}
32283237
IMGUI_API ImGuiWindow* FindWindowByID(ImGuiID id);
32293238
IMGUI_API ImGuiWindow* FindWindowByName(const char* name);
32303239
IMGUI_API void UpdateWindowParentAndRootLinks(ImGuiWindow* window, ImGuiWindowFlags flags, ImGuiWindow* parent_window);

0 commit comments

Comments
 (0)