summaryrefslogtreecommitdiff
path: root/src/gui/windows/inventorywindow.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-05-17 02:48:54 +0300
committerAndrei Karas <akaras@inbox.ru>2015-05-17 02:48:54 +0300
commit53cc3c86f2b5040cec577145feff9db2c93bd268 (patch)
tree44d3d91d85d9c10fbb8aa5636b0e72ebfea0c76f /src/gui/windows/inventorywindow.cpp
parent26f2c689298bb2077000b81ff3fe14328a89feb8 (diff)
downloadmanaplus-53cc3c86f2b5040cec577145feff9db2c93bd268.tar.gz
manaplus-53cc3c86f2b5040cec577145feff9db2c93bd268.tar.bz2
manaplus-53cc3c86f2b5040cec577145feff9db2c93bd268.tar.xz
manaplus-53cc3c86f2b5040cec577145feff9db2c93bd268.zip
Fix some issues after automatic checks.
Diffstat (limited to 'src/gui/windows/inventorywindow.cpp')
-rw-r--r--src/gui/windows/inventorywindow.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/gui/windows/inventorywindow.cpp b/src/gui/windows/inventorywindow.cpp
index c87fe3ebc..9a99937d5 100644
--- a/src/gui/windows/inventorywindow.cpp
+++ b/src/gui/windows/inventorywindow.cpp
@@ -148,8 +148,12 @@ InventoryWindow::InventoryWindow(Inventory *const inventory) :
mSortDropDown->setSelected(0);
}
- if (setupWindow && inventory->getType() != InventoryType::STORAGE)
+ if (setupWindow &&
+ inventory &&
+ inventory->getType() != InventoryType::STORAGE)
+ {
setupWindow->registerWindowForReset(this);
+ }
setResizable(true);
setCloseButton(true);