From 85c324b5d77fdc33e6de0681758f893fc597434b Mon Sep 17 00:00:00 2001 From: Marek Roszko Date: Fri, 5 Jan 2024 21:03:43 -0500 Subject: [PATCH] Change the __except to use the exception result codes (cherry picked from commit be21c689e838cebdda4bb31f570b25e61161623b) --- common/font/fontconfig.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/common/font/fontconfig.cpp b/common/font/fontconfig.cpp index f812e1c32a..fdec6e0861 100644 --- a/common/font/fontconfig.cpp +++ b/common/font/fontconfig.cpp @@ -73,7 +73,8 @@ static void bootstrapFc() g_fcInitSuccess = true; #if defined( _MSC_VER ) } - __except( GetExceptionCode() == STATUS_IN_PAGE_ERROR ) + __except( GetExceptionCode() == STATUS_IN_PAGE_ERROR ? EXCEPTION_EXECUTE_HANDLER + : EXCEPTION_CONTINUE_SEARCH ) { g_fcInitSuccess = false; // We have documented cases that fontconfig while trying to cache fonts