From 9d521a19be347703bfdbb7802d0397a59c3edd7a Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 24 Jun 2015 14:55:44 +0300 Subject: Add missing checks in windows. --- src/gui/windows/textcommandeditor.cpp | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) (limited to 'src/gui/windows/textcommandeditor.cpp') diff --git a/src/gui/windows/textcommandeditor.cpp b/src/gui/windows/textcommandeditor.cpp index fdffe0e75..4269508aa 100644 --- a/src/gui/windows/textcommandeditor.cpp +++ b/src/gui/windows/textcommandeditor.cpp @@ -46,7 +46,8 @@ TextCommandEditor::TextCommandEditor(TextCommand *const command) : // TRANSLATORS: command editor name Window(_("Command Editor"), Modal_false, nullptr, "commandeditor.xml"), ActionListener(), - mIsMagicCommand(command->getCommandType() == TEXT_COMMAND_MAGIC), + mIsMagicCommand(command ? + (command->getCommandType() == TEXT_COMMAND_MAGIC) : false), mCommand(command), // TRANSLATORS: command editor button mIsMagic(new RadioButton(this, _("magic"), "magic", mIsMagicCommand)), @@ -128,20 +129,23 @@ TextCommandEditor::TextCommandEditor(TextCommand *const command) : mCancelButton->adjustSize(); mDeleteButton->adjustSize(); - if (command->getCommandType() == TEXT_COMMAND_MAGIC) - showControls(Visible_true); - else - showControls(Visible_false); - - mSymbolTextField->setText(command->getSymbol()); - mCommandTextField->setText(command->getCommand()); - mCommentTextField->setText(command->getComment()); - mManaField->setValue(command->getMana()); - mTypeDropDown->setSelected(static_cast(command->getTargetType())); - mMagicLvlField->setValue(command->getBaseLvl()); - mSchoolDropDown->setSelected(static_cast(command->getSchool()) - - MAGIC_START_ID); - mSchoolLvlField->setValue(command->getSchoolLvl()); + if (command) + { + if (command->getCommandType() == TEXT_COMMAND_MAGIC) + showControls(Visible_true); + else + showControls(Visible_false); + + mSymbolTextField->setText(command->getSymbol()); + mCommandTextField->setText(command->getCommand()); + mCommentTextField->setText(command->getComment()); + mManaField->setValue(command->getMana()); + mTypeDropDown->setSelected(static_cast(command->getTargetType())); + mMagicLvlField->setValue(command->getBaseLvl()); + mSchoolDropDown->setSelected(static_cast(command->getSchool()) + - MAGIC_START_ID); + mSchoolLvlField->setValue(command->getSchoolLvl()); + } ContainerPlacer placer; placer = getPlacer(0, 0); -- cgit v1.2.3-70-g09d2