summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-05-06 21:27:07 +0300
committerAndrei Karas <akaras@inbox.ru>2013-05-06 21:27:07 +0300
commit551e9f611c391e3df4e7635a624336586a39fdfc (patch)
tree18d101fc0ebc2ecaccbae221c0bc6c4b83ab77fb
parent50029e25816b261dd5d9659d6da76cef7e392c27 (diff)
downloadmv-551e9f611c391e3df4e7635a624336586a39fdfc.tar.gz
mv-551e9f611c391e3df4e7635a624336586a39fdfc.tar.bz2
mv-551e9f611c391e3df4e7635a624336586a39fdfc.tar.xz
mv-551e9f611c391e3df4e7635a624336586a39fdfc.zip
improve buyselldialog class.
-rw-r--r--src/gui/buyselldialog.cpp10
-rw-r--r--src/gui/buyselldialog.h2
2 files changed, 7 insertions, 5 deletions
diff --git a/src/gui/buyselldialog.cpp b/src/gui/buyselldialog.cpp
index 32e762c1d..1c8c81b52 100644
--- a/src/gui/buyselldialog.cpp
+++ b/src/gui/buyselldialog.cpp
@@ -45,7 +45,7 @@ BuySellDialog::BuySellDialog(const int npcId) :
init();
}
-BuySellDialog::BuySellDialog(std::string nick) :
+BuySellDialog::BuySellDialog(const std::string &nick) :
// TRANSLATORS: shop window name
Window(_("Shop"), false, nullptr, "buysell.xml"),
gcn::ActionListener(),
@@ -84,9 +84,11 @@ void BuySellDialog::init()
add(btn);
x += btn->getWidth() + buttonPadding;
}
- mBuyButton->requestFocus();
-
- setContentSize(x, 2 * y + mBuyButton->getHeight());
+ if (mBuyButton)
+ {
+ mBuyButton->requestFocus();
+ setContentSize(x, 2 * y + mBuyButton->getHeight());
+ }
center();
setDefaultSize();
diff --git a/src/gui/buyselldialog.h b/src/gui/buyselldialog.h
index ef3a98f18..391d90793 100644
--- a/src/gui/buyselldialog.h
+++ b/src/gui/buyselldialog.h
@@ -45,7 +45,7 @@ class BuySellDialog final : public Window, public gcn::ActionListener
*/
explicit BuySellDialog(const int npcId);
- explicit BuySellDialog(std::string nick);
+ explicit BuySellDialog(const std::string &nick);
A_DELETE_COPY(BuySellDialog)