Fix lazy removal of unscoped messages also removing still valid msgs

1 files changed, 8 insertions, 0 deletions

diff --git a/src/catch2/internal/catch_run_context.cpp b/src/catch2/internal/catch_run_context.cpp
index 37045f60..1ecc0644 100644
--- a/src/catch2/internal/catch_run_context.cpp
+++ b/src/catch2/internal/catch_run_context.cpp
@@ -824,6 +824,14 @@ namespace Catch {
     }
 
     void IResultCapture::emplaceUnscopedMessage( MessageBuilder&& builder ) {
+        // Invalid unscoped messages are lazy cleared. If we have any,
+        // we have to get rid of them before adding new ones, or the
+        // delayed clear in assertion handling will erase the valid ones
+        // as well.
+        if ( Detail::g_clearMessageScopes ) {
+            Detail::g_messageScopes.clear();
+            Detail::g_clearMessageScopes = false;
+        }
         Detail::g_messageScopes.emplace_back( CATCH_MOVE( builder ) );
     }