UIA: Ignore menuOpened events if focus has been fired, as focus should be more correct.

diff --git a/source/_UIAHandler.py b/source/_UIAHandler.py
index d692f14..09f2f6b 100644 (file)
--- a/source/_UIAHandler.py
+++ b/source/_UIAHandler.py
@@ -163,6 +163,10 @@ class UIAHandler(COMObject):
                if not self.MTAThreadInitEvent.isSet:\r
                        # UIAHandler hasn't finished initialising yet, so just ignore this event.\r
                        return\r
+               if eventID==UIA_MenuOpenedEventId and eventHandler.isPendingEvents("gainFocus"):\r
+                       # We don't need the menuOpened event if focus has been fired,\r
+                       # as focus should be more correct.\r
+                       return\r
                NVDAEventName=UIAEventIdsToNVDAEventNames.get(eventID,None)\r
                if not NVDAEventName:\r
                        return\r