From f7c9b1176d2cb36a3f9ad12e6d57295bf600ddcb Mon Sep 17 00:00:00 2001 From: Angus Leeming Date: Mon, 11 Mar 2002 17:39:58 +0000 Subject: [PATCH] Initialise variable before being bitten by a bug report! git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3715 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/xforms/FeedbackController.C | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/frontends/xforms/FeedbackController.C b/src/frontends/xforms/FeedbackController.C index 40b5ce6e8f..d4aaa523e1 100644 --- a/src/frontends/xforms/FeedbackController.C +++ b/src/frontends/xforms/FeedbackController.C @@ -24,7 +24,7 @@ #include "support/LAssert.h" FeedbackController::FeedbackController() - : warning_posted_(false) + : warning_posted_(false), message_widget_(0) {} @@ -42,11 +42,6 @@ void FeedbackController::setMessageWidget(FL_OBJECT * ob) // preemptive handler for feedback messages void FeedbackController::MessageCB(FL_OBJECT * ob, int event) { - if (!message_widget_) { - // fail silently. - return; - } - lyx::Assert(ob); switch (event) { @@ -73,7 +68,8 @@ void FeedbackController::PrehandlerCB(FL_OBJECT * ob, int event, int key) // using the middle mouse button. InputCB(ob, 0); - } else if (event == FL_ENTER || event == FL_LEAVE){ + } else if (message_widget_ && + (event == FL_ENTER || event == FL_LEAVE)) { // Post feedback as the mouse enters the object, // remove it as the mouse leaves. MessageCB(ob, event); @@ -83,8 +79,6 @@ void FeedbackController::PrehandlerCB(FL_OBJECT * ob, int event, int key) void FeedbackController::postWarning(string const & warning) { - lyx::Assert(message_widget_); - warning_posted_ = true; string const str = _("WARNING! ") + warning; @@ -94,6 +88,8 @@ void FeedbackController::postWarning(string const & warning) void FeedbackController::postMessage(string const & message) { + lyx::Assert(message_widget_); + string const str = formatted(message, message_widget_->w-10, FL_SMALL_SIZE); -- 2.39.2