diff options
Diffstat (limited to 'vcl/source')
| -rw-r--r-- | vcl/source/window/menubarwindow.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/vcl/source/window/menubarwindow.cxx b/vcl/source/window/menubarwindow.cxx index 9eaaba67db81..a4eb0f74952a 100644 --- a/vcl/source/window/menubarwindow.cxx +++ b/vcl/source/window/menubarwindow.cxx @@ -350,9 +350,9 @@ void MenuBarWindow::KillActivePopup() if ( !m_pActivePopup ) return; - if (m_pActivePopup->m_pWindow) - if (static_cast<FloatingWindow *>(m_pActivePopup->m_pWindow.get())->IsInCleanUp()) - return; // kill it later + FloatingWindow* pFloatWin = m_pActivePopup->ImplGetFloatingWindow(); + if (pFloatWin && pFloatWin->IsInCleanUp()) + return; // kill it later if ( m_pActivePopup->bInCallback ) m_pActivePopup->bCanceled = true; |