From 5eaae8136ed00d77988d5e5d17f13946688deb91 Mon Sep 17 00:00:00 2001 From: Kevin Sawicki Date: Thu, 28 Jul 2016 08:48:56 -0700 Subject: [PATCH] Check that window is an EventDispatchingWindow --- atom/browser/common_web_contents_delegate_mac.mm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/atom/browser/common_web_contents_delegate_mac.mm b/atom/browser/common_web_contents_delegate_mac.mm index 34df15bb0c..c766061379 100644 --- a/atom/browser/common_web_contents_delegate_mac.mm +++ b/atom/browser/common_web_contents_delegate_mac.mm @@ -32,7 +32,8 @@ void CommonWebContentsDelegate::HandleKeyboardEvent( [[NSApp mainMenu] performKeyEquivalent:event.os_event]) return; - if (event.os_event.window) + if (event.os_event.window && + [event.os_event.window isKindOfClass:[EventDispatchingWindow class]]) [event.os_event.window redispatchKeyEvent:event.os_event]; }