diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-02-27 20:55:00 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-02-27 20:55:00 +0200 |
| commit | 18e96f5264fcdf56e2c6b2a67e1e63a8506a242f (patch) | |
| tree | 67abe5d534cd0ff6dc8c6ee06c5d6c102619d381 /indra/llui/lltoolbar.cpp | |
| parent | 20be54210f17db8499a234760b0eef91fb962731 (diff) | |
| parent | 8d21d29bd7fa038db632ff90fb0e1207d0713ca2 (diff) | |
Merge branch 'main' into DRTVWR-579-texture-preview
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; |