diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2024-07-18 18:14:22 +0300 |
|---|---|---|
| committer | Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com> | 2024-08-09 22:55:08 +0300 |
| commit | 04f95e78e38a682d4933ead0403e78507cbe79a6 (patch) | |
| tree | 0a068b7ba0fcc7d437a269717969d9144d18d6ab /indra | |
| parent | c65bbadb2f6bc6828c149e3c468473a8c12d094c (diff) | |
viewer#2061 Crash in ~LLScriptEdCore()
Diffstat (limited to 'indra')
| -rw-r--r-- | indra/newview/llpreviewscript.cpp | 8 |
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; |