summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-06-07 23:10:10 +0300
committerAndrei Karas <akaras@inbox.ru>2013-06-07 23:10:22 +0300
commite59e3ea04af6edc38a686df2ed4be440fb5d6682 (patch)
tree587f0115f98fd2f1b4e844a85da6d0f3e60cc6af
parent4f8e8c36290e46c00fa0266c4e4af553fac59a4c (diff)
downloadmanaverse-e59e3ea04af6edc38a686df2ed4be440fb5d6682.tar.gz
manaverse-e59e3ea04af6edc38a686df2ed4be440fb5d6682.tar.bz2
manaverse-e59e3ea04af6edc38a686df2ed4be440fb5d6682.tar.xz
manaverse-e59e3ea04af6edc38a686df2ed4be440fb5d6682.zip
add fixes after autochecks.
-rw-r--r--src/commands.h1
-rw-r--r--src/gui/tradewindow.cpp3
2 files changed, 3 insertions, 1 deletions
diff --git a/src/commands.h b/src/commands.h
index f41a16339..4b0e2a0f8 100644
--- a/src/commands.h
+++ b/src/commands.h
@@ -298,6 +298,7 @@ static const CommandInfo commands[] =
{"", &Commands::dontRemoveName, -1, false},
{"", &Commands::removeName, -1, false},
{"disableaway", &Commands::disableAway, -1, false},
+ {"enableaway", &Commands::enableAway, -1, false},
{"drop", nullptr, Input::KEY_QUICK_DROP, false},
{"dropn", nullptr, Input::KEY_QUICK_DROPN, false},
{"movetotarget", nullptr, Input::KEY_MOVE_TO_TARGET, false},
diff --git a/src/gui/tradewindow.cpp b/src/gui/tradewindow.cpp
index 2e5d026b2..3c1ce60bb 100644
--- a/src/gui/tradewindow.cpp
+++ b/src/gui/tradewindow.cpp
@@ -223,7 +223,8 @@ void TradeWindow::increaseQuantity(const int index, const bool own,
item = mMyInventory->getItem(index);
else
item = mPartnerInventory->getItem(index);
- item->increaseQuantity(quantity);
+ if (item)
+ item->increaseQuantity(quantity);
}
void TradeWindow::reset()