diff options
| author | Andrey Kleshchev <andreykproductengine@lindenlab.com> | 2024-02-24 00:54:57 +0200 |
|---|---|---|
| committer | Andrey Kleshchev <117672381+akleshchev@users.noreply.github.com> | 2024-02-25 15:28:02 +0200 |
| commit | d31de6afb2ac9f659efc13c438df727372fcac08 (patch) | |
| tree | 9d8cd012b8e5cc3a15702a6881b0b71ee2152b0c /indra/llui | |
| parent | 5dcc0606a8512159660c652cb25e7f29292f2df0 (diff) | |
Issue#884 Crash on ~LLSearchEditor
Crash seems to be specific to LLFilterEditor and only in a couple
specific floaters. Based on older calltacks, commiting on exit was
crashing. So I'm making sure that panels that potentially do not own
the element in question clean the callback in case panels get deleted
before the search editor.
Diffstat (limited to 'indra/llui')
| -rw-r--r-- | indra/llui/llsearcheditor.cpp | 7 | ||||
| -rw-r--r-- | indra/llui/llsearcheditor.h | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/indra/llui/llsearcheditor.cpp b/indra/llui/llsearcheditor.cpp index 78bd06b67e..13051998bd 100644 --- a/indra/llui/llsearcheditor.cpp +++ b/indra/llui/llsearcheditor.cpp @@ -104,6 +104,13 @@ LLSearchEditor::LLSearchEditor(const LLSearchEditor::Params& p) } } +LLSearchEditor::~LLSearchEditor() +{ + mKeystrokeCallback = NULL; + mTextChangedCallback = NULL; + setCommitOnFocusLost(false); +} + //virtual void LLSearchEditor::draw() { diff --git a/indra/llui/llsearcheditor.h b/indra/llui/llsearcheditor.h index b332967f9b..3f8c6323b0 100644 --- a/indra/llui/llsearcheditor.h +++ b/indra/llui/llsearcheditor.h @@ -74,7 +74,7 @@ protected: friend class LLUICtrlFactory; public: - virtual ~LLSearchEditor() {} + virtual ~LLSearchEditor(); /*virtual*/ void draw(); |