summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2018-10-19 12:55:00 +0100
committerMichael Stahl <Michael.Stahl@cib.de>2018-10-23 10:44:53 +0200
commitf6d13aa7e1f0dd3baafc70795008722b46867b76 (patch)
tree247bee84f9ef2e5b82a0843944511a76a8ba40fe /vcl
parent9fe444b407f2bdcf1956ac3498c7443b571159de (diff)
wrong pointer check
since... commit 2636ab883adbcb1f6593787934c6d6d3fff67c21 Date: Mon Sep 15 20:13:54 2014 +0200 vcl menu: Rename CloseStartedFrom() to ClosePopup() + adapt code. Change-Id: Ie30f6d907907551e23e592b8502107e75c333f2e Reviewed-on: https://gerrit.libreoffice.org/62045 Tested-by: Jenkins Reviewed-by: Michael Stahl <Michael.Stahl@cib.de>
Diffstat (limited to 'vcl')
-rw-r--r--vcl/source/window/menu.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 62739890e3aa..a2d6083c234f 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -2700,7 +2700,7 @@ void PopupMenu::ClosePopup(Menu* pMenu)
{
MenuFloatingWindow* p = dynamic_cast<MenuFloatingWindow*>(ImplGetWindow());
PopupMenu *pPopup = dynamic_cast<PopupMenu*>(pMenu);
- if (p && pMenu)
+ if (p && pPopup)
p->KillActivePopup(pPopup);
}