Refinement in how clear_current_error is handled

boostorg · Sep 4, 2024 · 16f1341 · 16f1341
1 parent 3422b31
commit 16f1341
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/include/boost/leaf/exception.hpp b/include/boost/leaf/exception.hpp
@@ -85,6 +85,11 @@ namespace leaf_detail
     {
         mutable bool clear_current_error_;
 
+        bool is_current_exception() const noexcept
+        {
+            return tls::read_uint<leaf_detail::tls_tag_id_factory_current_id>() == error_id::value();
+        }
+
         error_id get_error_id() const noexcept final override
         {
             clear_current_error_ = false;
@@ -143,7 +148,7 @@ namespace leaf_detail
 
         ~exception() noexcept
         {
-            if( clear_current_error_ )
+            if( clear_current_error_ && is_current_exception() )
                 tls::write_uint<leaf_detail::tls_tag_id_factory_current_id>(0);
         }
     };