Do not process editor control events when propgrid event is currently being processed...

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

diff --git a/src/propgrid/propgrid.cpp b/src/propgrid/propgrid.cpp
index e941c2a6c16f406b971baed35d0c703a9f286f38..a366de4640fa23609d7f6752d5bae11e85854c0b 100644 (file)
--- a/src/propgrid/propgrid.cpp
+++ b/src/propgrid/propgrid.cpp
@@ -3334,7 +3334,12 @@ void wxPropertyGrid::HandleCustomEditorEvent( wxEvent &event )
 
     // Somehow, event is handled after property has been deselected.
     // Possibly, but very rare.
-    if ( !selected || selected->HasFlag(wxPG_PROP_BEING_DELETED) )
+    if ( !selected ||
+          selected->HasFlag(wxPG_PROP_BEING_DELETED) ||
+          // Also don't handle editor event if wxEVT_PG_CHANGED or
+          // similar is currently doing something (showing a
+          // message box, for instance).
+          m_processedEvent )
         return;
 
     if ( m_iFlags & wxPG_FL_IN_HANDLECUSTOMEDITOREVENT )