diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-09-28 21:27:33 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-09-28 21:27:33 +0300 |
| commit | 727808b197394912f212641fb2e39088eab82060 (patch) | |
| tree | dfb44abad27a4cce61a1931a9656e03df786bfe7 /src/gui | |
| parent | d9eab6bbcd939f1238283ac9bbe003e06de4169c (diff) | |
| download | manaplus-727808b197394912f212641fb2e39088eab82060.tar.gz manaplus-727808b197394912f212641fb2e39088eab82060.tar.bz2 manaplus-727808b197394912f212641fb2e39088eab82060.tar.xz manaplus-727808b197394912f212641fb2e39088eab82060.zip | |
Add some checks after previous commit.
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/inventorywindow.cpp | 3 | ||||
| -rw-r--r-- | src/gui/widgets/itemcontainer.cpp | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/gui/inventorywindow.cpp b/src/gui/inventorywindow.cpp index d6377e4dd..f52151698 100644 --- a/src/gui/inventorywindow.cpp +++ b/src/gui/inventorywindow.cpp @@ -378,7 +378,8 @@ Item *InventoryWindow::getSelectedItem() const void InventoryWindow::widgetHidden(const gcn::Event &event) { Window::widgetHidden(event); - mItems->hidePopup(); + if (mItems) + mItems->hidePopup(); } void InventoryWindow::mouseClicked(gcn::MouseEvent &event) diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp index de8b3c277..9a17d81cd 100644 --- a/src/gui/widgets/itemcontainer.cpp +++ b/src/gui/widgets/itemcontainer.cpp @@ -329,7 +329,8 @@ void ItemContainer::distributeValueChangedEvent() void ItemContainer::hidePopup() { - mItemPopup->setVisible(false); + if (mItemPopup) + mItemPopup->setVisible(false); } void ItemContainer::keyPressed(gcn::KeyEvent &event A_UNUSED) |