[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.0' - vcl/source

[Andras Timar]

 vcl/source/window/menufloatingwindow.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 48ef3c7a4a2ababe9c2ce5c1fcf167c909441862
Author: Andras Timar <andras.timar at collabora.com>
Date:   Fri Dec 11 23:01:15 2015 +0100

    men can be null
    
    Change-Id: Ie8edf34c6e23b3cc305e8e2ef9839dffa5ea820c

diff --git a/vcl/source/window/menufloatingwindow.cxx b/vcl/source/window/menufloatingwindow.cxx
index edd20a6..990d64c 100644
--- a/vcl/source/window/menufloatingwindow.cxx
+++ b/vcl/source/window/menufloatingwindow.cxx
@@ -1113,9 +1113,9 @@ void MenuFloatingWindow::KeyInput( const KeyEvent& rKEvent )
                 pMenu->GetItemList()->SearchItem(nCharCode, rKEvent.GetKeyCode(), nPos, nDuplicates, nHighlightedItem) : NULL;
             bool accel = ImplGetSVData()->maNWFData.mbEnableAccel;
             Menu *men = pMenu;
-            while (!men->IsMenuBar())
+            while (men && !men->IsMenuBar())
                 men = men->pStartedFrom;
-            if ( pData && (static_cast<MenuBarWindow*>(men->pWindow.get()))->GetMBWMenuKey () && accel )
+            if ( men && pData && (static_cast<MenuBarWindow*>(men->pWindow.get()))->GetMBWMenuKey () && accel )
             {
                 if ( pData->pSubMenu || nDuplicates > 1 )
                 {