[Libreoffice-commits] core.git: vcl/source

[Libreoffice Gerrit user]

 vcl/source/window/menu.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b361413eef7e46f340d921708faca9986c63c9f8
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Oct 19 12:55:00 2018 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sat Oct 20 13:50:58 2018 +0200

    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/61997
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 699ba937ee95..ba1138205a29 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -2701,7 +2701,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);
 }