diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-08-22 00:17:03 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-08-22 00:46:00 +0300 |
| commit | e26c01fe66bc698555fdee9d681b3abd6822848a (patch) | |
| tree | e74773ce1c66a714ee933d8228d94d205a37aa43 /src/gui/windows | |
| parent | d181a2fb30ac73173fba851d4b2f7ca6f7d46ca0 (diff) | |
| download | manaverse-e26c01fe66bc698555fdee9d681b3abd6822848a.tar.gz manaverse-e26c01fe66bc698555fdee9d681b3abd6822848a.tar.bz2 manaverse-e26c01fe66bc698555fdee9d681b3abd6822848a.tar.xz manaverse-e26c01fe66bc698555fdee9d681b3abd6822848a.zip | |
Remove some parentheses.
Diffstat (limited to 'src/gui/windows')
| -rw-r--r-- | src/gui/windows/inventorywindow.cpp | 2 | ||||
| -rw-r--r-- | src/gui/windows/tradewindow.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/windows/inventorywindow.cpp b/src/gui/windows/inventorywindow.cpp index 27caa2019..cd688be9b 100644 --- a/src/gui/windows/inventorywindow.cpp +++ b/src/gui/windows/inventorywindow.cpp @@ -558,7 +558,7 @@ void InventoryWindow::mouseClicked(MouseEvent &event) const bool mod = (isStorageActive() && inputManager.isActionActive(InputAction::STOP_ATTACK)); - const bool mod2 = ((tradeWindow != nullptr) && + const bool mod2 = (tradeWindow != nullptr && tradeWindow->isWindowVisible() && inputManager.isActionActive(InputAction::STOP_ATTACK)); diff --git a/src/gui/windows/tradewindow.cpp b/src/gui/windows/tradewindow.cpp index 143a625e7..66f4e0550 100644 --- a/src/gui/windows/tradewindow.cpp +++ b/src/gui/windows/tradewindow.cpp @@ -549,5 +549,5 @@ bool TradeWindow::checkItem(const Item *const item) const bool TradeWindow::isInpupFocused() const { - return ((mMoneyField != nullptr) && mMoneyField->isFocused()); + return mMoneyField != nullptr && mMoneyField->isFocused(); } |