Skip to content

Commit ee977d4

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

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
@@ -3337,7 +3337,16 @@ namespace ImGui
33373337
IMGUI_API ImGuiIO& GetIO(ImGuiContext* ctx);
33383338
IMGUI_API ImGuiPlatformIO& GetPlatformIO(ImGuiContext* ctx);
33393339
inline ImGuiWindow* GetCurrentWindowRead() { ImGuiContext& g = *GImGui; return g.CurrentWindow; }
3340-
inline ImGuiWindow* GetCurrentWindow() { ImGuiContext& g = *GImGui; g.CurrentWindow->WriteAccessed = true; return g.CurrentWindow; }
3340+
inline ImGuiWindow* GetCurrentWindow()
3341+
{
3342+
ImGuiContext& g = *GImGui;
3343+
#ifdef IMGUI_BUNDLE_PYTHON_API
3344+
// Help python users, because otherwise, this leads to an un-debuggable segfault
3345+
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().");
3346+
#endif
3347+
g.CurrentWindow->WriteAccessed = true;
3348+
return g.CurrentWindow;
3349+
}
33413350
IMGUI_API ImGuiWindow* FindWindowByID(ImGuiID id);
33423351
IMGUI_API ImGuiWindow* FindWindowByName(const char* name);
33433352
IMGUI_API void UpdateWindowParentAndRootLinks(ImGuiWindow* window, ImGuiWindowFlags flags, ImGuiWindow* parent_window);

0 commit comments

Comments
 (0)