From 098a9edf78a3f71a6e49cf926dd7d5eaafacf407 Mon Sep 17 00:00:00 2001 From: Edwin Leuven Date: Wed, 18 Dec 2002 14:13:16 +0000 Subject: [PATCH] fix crash on custom bullet cancel git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5854 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/qt2/BulletsModule.C | 12 +++++++----- src/frontends/qt2/ChangeLog | 4 ++++ 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/frontends/qt2/BulletsModule.C b/src/frontends/qt2/BulletsModule.C index 4d7d7fcb90..5572894623 100644 --- a/src/frontends/qt2/BulletsModule.C +++ b/src/frontends/qt2/BulletsModule.C @@ -260,9 +260,11 @@ void BulletsModule::setCustom() qt_( "Enter a custom bullet" ), QLineEdit::Normal, QString::null, &ok, this ); - - activeitem_->setPixmap(0,QPixmap()); - activeitem_->setText(0,text); - activebullet_->setText(fromqstr(text)); - activebullet_->setFont(-1); + + if (ok) { + activeitem_->setPixmap(0,QPixmap()); + activeitem_->setText(0,text); + activebullet_->setText(fromqstr(text)); + activebullet_->setFont(-1); + } } diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog index f14c0de178..20ae02966b 100644 --- a/src/frontends/qt2/ChangeLog +++ b/src/frontends/qt2/ChangeLog @@ -1,3 +1,7 @@ +2002-12-18 Edwin Leuven + + * BulletsModule.C: fix crash on custom bullet cancel + 2002-12-18 John Levon * qfont_loader.C: symbol should not match "Standard Symbols 1"