From 2dd3b4c1c4d29ffc96013d07f10f58851418fcd3 Mon Sep 17 00:00:00 2001 From: Chris Jones Date: Fri, 25 Jan 2013 11:51:16 -0800 Subject: [PATCH] Bug 834760: Null-check mAttachedWidgetListener. r=mwu a=blocking-b2g --- widget/xpwidgets/PuppetWidget.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/widget/xpwidgets/PuppetWidget.cpp b/widget/xpwidgets/PuppetWidget.cpp index a963d54e248d..a5088041b96b 100644 --- a/widget/xpwidgets/PuppetWidget.cpp +++ b/widget/xpwidgets/PuppetWidget.cpp @@ -263,8 +263,6 @@ PuppetWidget::DispatchEvent(nsGUIEvent* event, nsEventStatus& aStatus) aStatus = nsEventStatus_eIgnore; - NS_ABORT_IF_FALSE(mAttachedWidgetListener, "No listener!"); - if (event->message == NS_COMPOSITION_START) { mIMEComposing = true; } @@ -286,7 +284,9 @@ PuppetWidget::DispatchEvent(nsGUIEvent* event, nsEventStatus& aStatus) break; } - aStatus = mAttachedWidgetListener->HandleEvent(event, mUseAttachedEvents); + if (mAttachedWidgetListener) { + aStatus = mAttachedWidgetListener->HandleEvent(event, mUseAttachedEvents); + } if (event->message == NS_COMPOSITION_END) { mIMEComposing = false; -- 2.11.4.GIT