diff options
| author | Dave Parks <davep@lindenlab.com> | 2023-02-02 14:35:22 -0600 |
|---|---|---|
| committer | Dave Parks <davep@lindenlab.com> | 2023-02-02 14:35:22 -0600 |
| commit | 55ee008035cd41ac2c8c2b95bd251adcb3699c5a (patch) | |
| tree | 3c39277e429b8742c7cff815e6aea4e75e942490 /indra/llui/lltoolbar.cpp | |
| parent | 93b1da52f56293663d9bfe5272a83a77185f4cff (diff) | |
| parent | dc1dd7a274e1ce49eb68ca525eba7f2e39032fa8 (diff) | |
Merge branch 'DRTVWR-559' of github.com:secondlife/viewer 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; |