From 727808b197394912f212641fb2e39088eab82060 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 28 Sep 2011 21:27:33 +0300 Subject: Add some checks after previous commit. --- src/gui/inventorywindow.cpp | 3 ++- 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) -- cgit v1.2.3-60-g2f50