From e97b97467e434d2c53b76a19563d641e55130e16 Mon Sep 17 00:00:00 2001
From: ocornut <omarcornut@gmail.com>
Date: Tue, 12 Nov 2024 19:09:00 +0100
Subject: [PATCH] Error Handling: fixed cases where recoverable error handling
 would crash. (#1651)

---
 docs/CHANGELOG.txt | 4 ++++
 imgui.cpp          | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/docs/CHANGELOG.txt b/docs/CHANGELOG.txt
index 67d5bef53..6586cba20 100644
--- a/docs/CHANGELOG.txt
+++ b/docs/CHANGELOG.txt
@@ -43,6 +43,10 @@ Breaking changes:
 
 Other changes:
 
+- Error Handling: fixed cases where recoverable error handling would crash when 
+  processing errors outside of the NewFrame()..EndFrame() scope. (#1651)
+
+
 -----------------------------------------------------------------------
  VERSION 1.91.5 (Released 2024-11-07)
 -----------------------------------------------------------------------
diff --git a/imgui.cpp b/imgui.cpp
index 431cac9c1..45af644ae 100644
--- a/imgui.cpp
+++ b/imgui.cpp
@@ -10542,7 +10542,7 @@ bool    ImGui::ErrorLog(const char* msg)
     // Output to tooltip
     if (g.IO.ConfigErrorRecoveryEnableTooltip)
     {
-        if (BeginErrorTooltip())
+        if (g.WithinFrameScope && BeginErrorTooltip())
         {
             if (g.ErrorCountCurrentFrame < 20)
             {