From 378ff64729942a63b13150b1efdccba803c536a0 Mon Sep 17 00:00:00 2001 From: "mkaply%us.ibm.com" Date: Sun, 22 Jul 2001 13:24:51 +0000 Subject: [PATCH] #91760 r=dbaron, sr=tor XLIB only - Checkin for Roland.Mainz@informatik.med.uni-giessen.de - crash shutting down --- widget/src/xlib/nsClipboard.cpp | 6 +----- widget/src/xlib/nsWidget.cpp | 1 + 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/widget/src/xlib/nsClipboard.cpp b/widget/src/xlib/nsClipboard.cpp index 49cf261372da..b3de70a57152 100644 --- a/widget/src/xlib/nsClipboard.cpp +++ b/widget/src/xlib/nsClipboard.cpp @@ -112,11 +112,7 @@ void nsClipboard::Init() { nsEventStatus PR_CALLBACK nsClipboard::Callback(nsGUIEvent *event) { XEvent *ev = (XEvent *)event->nativeMsg; - /* gisburn: quick hack fix for bug 68472 to avoid crash on shutdown - * I simply assume that this only happens at shutdown... - * FIXME: We should fix&kill the real cause of this problem... - */ - NS_ASSERTION(ev != nsnull, "nsGUIEvent with event->nativeMsg==nsnull"); + /* may be nsnull in the |event->message == NS_DESTROY| case... */ if(ev == nsnull) return nsEventStatus_eIgnore; diff --git a/widget/src/xlib/nsWidget.cpp b/widget/src/xlib/nsWidget.cpp index 670ae75ab8e9..d0358a5d053f 100644 --- a/widget/src/xlib/nsWidget.cpp +++ b/widget/src/xlib/nsWidget.cpp @@ -1045,6 +1045,7 @@ PRBool nsWidget::DispatchDestroyEvent(void) { PRBool result = PR_FALSE; if (nsnull != mEventCallback) { nsGUIEvent event; + event.nativeMsg = nsnull; event.eventStructType = NS_GUI_EVENT; event.message = NS_DESTROY; event.widget = this;