From b78b6667973f9db06764e75eae1a03427214c184 Mon Sep 17 00:00:00 2001 From: phosit Date: Thu, 6 Mar 2025 20:57:56 +0100 Subject: [PATCH] Catch all std::exception from a map in atlas Since 0eed117e6d exceptions from the map generation script are rethrown in the main thread but not all of them are catched. This defect is already fixed in the engine with 82513c9104 Fixes: #7620 (cherry picked from commit 56abf84da222394326eb7836b245ad293946ccbf) Signed-off-by: Itms --- source/tools/atlas/GameInterface/Handlers/MapHandlers.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/tools/atlas/GameInterface/Handlers/MapHandlers.cpp b/source/tools/atlas/GameInterface/Handlers/MapHandlers.cpp index f83936e066..0960d75c16 100644 --- a/source/tools/atlas/GameInterface/Handlers/MapHandlers.cpp +++ b/source/tools/atlas/GameInterface/Handlers/MapHandlers.cpp @@ -127,7 +127,7 @@ QUERYHANDLER(GenerateMap) msg->status = 0; } - catch (PSERROR_Game_World_MapLoadFailed&) + catch (std::exception&) { // Cancel loading LDR_Cancel();