Merge remote-tracking branch 'secondlife/release/2024.06-atlasaurus' into 2024.06-atlasaurus

1 files changed, 7 insertions, 1 deletions

diff --git a/indra/newview/llpreviewscript.cpp b/indra/newview/llpreviewscript.cpp
index c2188ea638..b7c929f0b5 100644
--- a/indra/newview/llpreviewscript.cpp
+++ b/indra/newview/llpreviewscript.cpp
@@ -414,7 +414,13 @@ LLScriptEdCore::~LLScriptEdCore()
     if (script_search && script_search->getEditorCore() == this)
     {
         script_search->closeFloater();
-        delete script_search;
+        // closeFloater can delete instance since it's not reusable nor single instance
+        // so make sure instance is still there before deleting
+        script_search = LLFloaterScriptSearch::getInstance();
+        if (script_search)
+        {
+            delete script_search;
+        }
     }
 
     delete mLiveFile;