From 5c746ae372a0f4ab249377091bc7cdca4ca474f7 Mon Sep 17 00:00:00 2001
From: Maxim Nikolenko <maximnproductengine@lindenlab.com>
Date: Fri, 25 Jul 2025 01:44:36 +0300
Subject: #4415 fix crash when cancelling large model process on MacOS

---
 indra/newview/llmodelpreview.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/indra/newview/llmodelpreview.cpp b/indra/newview/llmodelpreview.cpp
index e819f4dec0..d68fc9c02d 100644
--- a/indra/newview/llmodelpreview.cpp
+++ b/indra/newview/llmodelpreview.cpp
@@ -3084,9 +3084,12 @@ void LLModelPreview::loadedCallback(
     S32 lod,
     void* opaque)
 {
+    if(LLModelPreview::sIgnoreLoadedCallback)
+        return;
+
     LLModelPreview* pPreview = static_cast<LLModelPreview*>(opaque);
     LLMutexLock lock(pPreview);
-    if (pPreview && pPreview->mModelLoader && !LLModelPreview::sIgnoreLoadedCallback)
+    if (pPreview && pPreview->mModelLoader)
     {
         // Load loader's warnings into floater's log tab
         const LLSD out = pPreview->mModelLoader->logOut();
-- 
cgit v1.2.3