[ 1522987 ] wxComboCtrl crashes if TAB is pressed while popup is open

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40157 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/combocmn.cpp b/src/common/combocmn.cpp
index e2a0fd70c37c05db04d7b3eb25af101bec82cebb..30b35a7dd0b8d502e7f1e131bdaaf45b7e6eb4d9 100644 (file)
--- a/src/common/combocmn.cpp
+++ b/src/common/combocmn.cpp
@@ -461,7 +461,7 @@ void wxComboBoxExtraInputHandler::OnKey(wxKeyEvent& event)
 {
     int keycode = event.GetKeyCode();
 
-    if ( keycode == WXK_TAB )
+    if ( keycode == WXK_TAB && !m_combo->IsPopupShown() )
     {
         wxNavigationKeyEvent evt;
         evt.SetFlags(wxNavigationKeyEvent::FromTab|