From 552969e33e043b05cf20161e8879e838f02c8bcf Mon Sep 17 00:00:00 2001 From: ocornut Date: Tue, 14 Mar 2023 14:28:41 +0100 Subject: [PATCH] BeginTooltip: correctly testing return value of BeginTooltipEx() even though it always return true in current code. Amend 3b2f617 --- imgui.cpp | 3 ++- imgui_widgets.cpp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/imgui.cpp b/imgui.cpp index 075adddd7..823ad2fb9 100644 --- a/imgui.cpp +++ b/imgui.cpp @@ -9942,7 +9942,8 @@ void ImGui::EndTooltip() void ImGui::SetTooltipV(const char* fmt, va_list args) { - BeginTooltipEx(ImGuiTooltipFlags_OverridePreviousTooltip, ImGuiWindowFlags_None); + if (!BeginTooltipEx(ImGuiTooltipFlags_OverridePreviousTooltip, ImGuiWindowFlags_None)) + return; TextV(fmt, args); EndTooltip(); } diff --git a/imgui_widgets.cpp b/imgui_widgets.cpp index 0279df239..8e5f5b754 100644 --- a/imgui_widgets.cpp +++ b/imgui_widgets.cpp @@ -5759,7 +5759,8 @@ void ImGui::ColorTooltip(const char* text, const float* col, ImGuiColorEditFlags { ImGuiContext& g = *GImGui; - BeginTooltipEx(ImGuiTooltipFlags_OverridePreviousTooltip, ImGuiWindowFlags_None); + if (!BeginTooltipEx(ImGuiTooltipFlags_OverridePreviousTooltip, ImGuiWindowFlags_None)) + return; const char* text_end = text ? FindRenderedTextEnd(text, NULL) : text; if (text_end > text) {