From 2a89557f92a5b920c469db60787deb62cfcf4baf Mon Sep 17 00:00:00 2001 From: Angus Leeming Date: Mon, 11 Mar 2002 17:31:07 +0000 Subject: [PATCH] Fix crash by removing unjustified Assert. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3714 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/xforms/ChangeLog | 9 +++++++++ src/frontends/xforms/FeedbackController.C | 7 ++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog index 431577a7bd..4a891a5bf8 100644 --- a/src/frontends/xforms/ChangeLog +++ b/src/frontends/xforms/ChangeLog @@ -1,3 +1,12 @@ +2002-03-09 Angus Leeming + + * FeedbackController.C (MessageCB): fix crash by removing + Assert(message_widget_) and returning silently in this case. + Can happen quite justifiably. + + * Most files: consistent comments at the top of the file, usable by + sourcedoc. + 2002-03-09 Herbert Voss * FormGraphics.C: test if file exists, simplify an if command diff --git a/src/frontends/xforms/FeedbackController.C b/src/frontends/xforms/FeedbackController.C index 6d3e4e78d3..40b5ce6e8f 100644 --- a/src/frontends/xforms/FeedbackController.C +++ b/src/frontends/xforms/FeedbackController.C @@ -42,7 +42,12 @@ void FeedbackController::setMessageWidget(FL_OBJECT * ob) // preemptive handler for feedback messages void FeedbackController::MessageCB(FL_OBJECT * ob, int event) { - lyx::Assert(ob && message_widget_); + if (!message_widget_) { + // fail silently. + return; + } + + lyx::Assert(ob); switch (event) { case FL_ENTER: -- 2.39.2