summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2021-11-25 14:03:30 +0000
committerCaolán McNamara <caolanm@redhat.com>2021-11-25 16:14:59 +0100
commit3057538549fb30a0f5312653a97216ba93f126a2 (patch)
tree823fef1d779f36c1775729bcdf7d02be824fe7da
parenttdf#145539 const OUString -> constexpr OUStringLiteral (diff)
downloadcore-3057538549fb30a0f5312653a97216ba93f126a2.tar.gz
core-3057538549fb30a0f5312653a97216ba93f126a2.zip
Resolves: tdf#145863 crash if popup closed before becoming truly visible
the timing has to be just right to get this to happen Change-Id: I1ae81bf5c79b7f8b3fdf82b3fab94d5a3b6076cc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125816 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--sc/source/ui/cctrl/checklistmenu.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx
index 05bd1cc15a0e..e88d99166eed 100644
--- a/sc/source/ui/cctrl/checklistmenu.cxx
+++ b/sc/source/ui/cctrl/checklistmenu.cxx
@@ -1400,7 +1400,8 @@ void ScCheckListMenuControl::setPopupEndAction(Action* p)
IMPL_LINK_NOARG(ScCheckListMenuControl, PopupModeEndHdl, weld::Popover&, void)
{
- clearSelectedMenuItem();
+ if (mxMenu)
+ clearSelectedMenuItem();
if (mxPopupEndAction)
mxPopupEndAction->execute();