From b119b41b4b11a3555e45b7a52f4872cdb30507a7 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Thu, 30 Oct 2014 14:18:18 +0100 Subject: Do not send focus event to missing plugins on OS X Fix a crash when trying to focus a pluginview that doesn't have a loaded plugin. Task-number: QTBUG-40273 Change-Id: I0875cab81a3484094fc705d59df80b87ca83a9ff Reviewed-by: Michael Bruning --- Source/WebCore/plugins/mac/PluginViewMac.mm | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Source/WebCore/plugins/mac/PluginViewMac.mm b/Source/WebCore/plugins/mac/PluginViewMac.mm index f8f2bc634..60a6d7a67 100644 --- a/Source/WebCore/plugins/mac/PluginViewMac.mm +++ b/Source/WebCore/plugins/mac/PluginViewMac.mm @@ -248,6 +248,9 @@ void PluginView::setFocus(bool focused) Widget::setFocus(focused); + if (!m_plugin || !m_isStarted || m_status != PluginStatusLoadedSuccessfully) + return; + NPCocoaEvent cocoaEvent; initializeNPCocoaEvent(&cocoaEvent); cocoaEvent.type = NPCocoaEventFocusChanged; -- cgit v1.2.3