From e918d240fd516d9116f0d1c170df34039c63a3ac Mon Sep 17 00:00:00 2001
From: Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com>
Date: Fri, 19 Sep 2025 01:00:43 +0300
Subject: #4679 Logging for crash on updateMenuOptions

Logs say that viewer closed settings picker and immediately crashed
Yet callstack indicates that some inventory was right clicked, which
shouldn't be possible if picker already closed.
May be some click is closing the picker and opens menu at the same time,
but it's better to gather information first.
---
 indra/newview/llsettingspicker.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'indra/newview/llsettingspicker.cpp')

diff --git a/indra/newview/llsettingspicker.cpp b/indra/newview/llsettingspicker.cpp
index 619882dc5e..5fc39b0dd8 100644
--- a/indra/newview/llsettingspicker.cpp
+++ b/indra/newview/llsettingspicker.cpp
@@ -152,7 +152,11 @@ void LLFloaterSettingsPicker::onClose(bool app_quitting)
         owner->setFocus(true);
     }
     mSettingItemID.setNull();
-    mInventoryPanel->getRootFolder()->clearSelection();
+    mInventoryPanel->clearSelection();
+    if (mInventoryPanel->getRootFolder())
+    {
+        mInventoryPanel->getRootFolder()->clearSelection();
+    }
 }
 
 void LLFloaterSettingsPicker::setValue(const LLSD& value)
-- 
cgit v1.2.3