diff options
| author | Callum Prentice <callum@lindenlab.com> | 2023-02-13 14:12:59 -0800 |
|---|---|---|
| committer | Callum Prentice <callum@lindenlab.com> | 2023-02-13 14:12:59 -0800 |
| commit | 422cd237dff521b35521292a8fccca61eaece23a (patch) | |
| tree | ec275907b06d8839b2c6f984a0c7ad11719efc77 /indra/llui/lltoolbar.cpp | |
| parent | f3cd329b585ef55a66f2a824f010d1a54d67d8d2 (diff) | |
| parent | 8d21d29bd7fa038db632ff90fb0e1207d0713ca2 (diff) | |
Fix up a couple of tiny merge conflicts after a merge with main
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; |