From a259a5380ca980da4fcfb866777192231aa9f854 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 19 Oct 2013 12:37:55 +0300 Subject: move virtual member calls from textcommandeditor constructor into postInit. --- src/gui/popups/popupmenu.cpp | 2 +- src/gui/windows/textcommandeditor.cpp | 3 +++ src/gui/windows/textcommandeditor.h | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) (limited to 'src/gui') diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp index ce96d2abd..daee76630 100644 --- a/src/gui/popups/popupmenu.cpp +++ b/src/gui/popups/popupmenu.cpp @@ -1341,7 +1341,7 @@ void PopupMenu::handleLink(const std::string &link, } else if (link == "edit spell" && mSpell) { - new TextCommandEditor(mSpell); + (new TextCommandEditor(mSpell))->postInit(); } else if (link == "undress" && being) { diff --git a/src/gui/windows/textcommandeditor.cpp b/src/gui/windows/textcommandeditor.cpp index e7bd8eb2c..da0eadfec 100644 --- a/src/gui/windows/textcommandeditor.cpp +++ b/src/gui/windows/textcommandeditor.cpp @@ -296,7 +296,10 @@ TextCommandEditor::TextCommandEditor(TextCommand *const command) : reflowLayout(w); center(); +} +void TextCommandEditor::postInit() +{ enableVisibleSound(true); setVisible(true); } diff --git a/src/gui/windows/textcommandeditor.h b/src/gui/windows/textcommandeditor.h index 1a1138b3a..cd080aebb 100644 --- a/src/gui/windows/textcommandeditor.h +++ b/src/gui/windows/textcommandeditor.h @@ -53,6 +53,8 @@ class TextCommandEditor final : public Window, public gcn::ActionListener */ ~TextCommandEditor(); + void postInit() override; + void action(const gcn::ActionEvent &event) override; void scheduleDelete() override; -- cgit v1.2.3-60-g2f50