diff options
| author | Brad Linden <brad@lindenlab.com> | 2023-02-02 12:11:40 -0800 |
|---|---|---|
| committer | Brad Linden <brad@lindenlab.com> | 2023-02-02 12:11:40 -0800 |
| commit | 5fabfa50d7135d29c0cb8a553006cf9038f9baae (patch) | |
| tree | 1d0f21551bd443d4e1ba187480c082d612dfaac5 /indra/llui/lltoolbar.cpp | |
| parent | 627e3d51c61778e07e350689ce68ede24afe61ab (diff) | |
| parent | 8d21d29bd7fa038db632ff90fb0e1207d0713ca2 (diff) | |
Merge remote-tracking branch 'origin/main' into DRTVWR-559
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; |