X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ccd970b13b43a0ffa7fae9146c9c3cf4264dfc4b..434005ca85ce8b4e08092add395f26147004c298:/src/generic/grid.cpp

diff --git a/src/generic/grid.cpp b/src/generic/grid.cpp
index fc1b7ced2a..b6afb0c214 100644
--- a/src/generic/grid.cpp
+++ b/src/generic/grid.cpp
@@ -5832,7 +5832,14 @@ void wxGrid::OnKeyDown( wxKeyEvent& event )
                          || editor->IsAcceptedKey(event) )
                     {
                         EnableCellEditControl();
-                        editor->StartingKey(event);
+
+                        // the editor could be not shown for a variety of
+                        // reasons (i.e. blocked by the app or whatever), so
+                        // check if it really was created
+                        if ( m_cellEditCtrlEnabled )
+                        {
+                            editor->StartingKey(event);
+                        }
                     }
                     else
                     {