diff options
| author | Rye Mutt <rye@alchemyviewer.org> | 2022-10-19 16:23:25 -0400 |
|---|---|---|
| committer | Rye Mutt <rye@alchemyviewer.org> | 2022-10-19 16:28:03 -0400 |
| commit | bbd8df15de6b8f9b321f251c3e764ea654d5ecc7 (patch) | |
| tree | 58c0edcab9957d03dad372b37601c479953eee5d /indra/llui/lltoolbar.cpp | |
| parent | a48374e8cfbdf261b4902024fb66e60432602b12 (diff) | |
Fix menu leaks and lazy creation in text editing and scroll lists
Diffstat (limited to 'indra/llui/lltoolbar.cpp')
| -rw-r--r-- | indra/llui/lltoolbar.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/indra/llui/lltoolbar.cpp b/indra/llui/lltoolbar.cpp index 5150df25f2..2707f7a15c 100644 --- a/indra/llui/lltoolbar.cpp +++ b/indra/llui/lltoolbar.cpp @@ -127,7 +127,12 @@ LLToolBar::LLToolBar(const LLToolBar::Params& p) LLToolBar::~LLToolBar() { - delete mPopupMenuHandle.get(); + auto menu = mPopupMenuHandle.get(); + if (menu) + { + menu->die(); + mPopupMenuHandle.markDead(); + } delete mButtonAddSignal; delete mButtonEnterSignal; delete mButtonLeaveSignal; |