Merge pull request #2381 from akortunov/warnfix

Fix an exception during reload when container windows is active
6 years ago · 50c87bacea
parent d37cb871d6 27737d4258
commit 50c87bacea
1 changed files with 2 additions and 1 deletions
--- a/apps/openmw/mwgui/container.cpp
+++ b/apps/openmw/mwgui/container.cpp
@ -161,7 +161,8 @@ namespace MWGui
        if (mModel)
            mModel->onClose();

-        MWBase::Environment::get().getMechanicsManager()->onClose(mPtr);
+        if (!mPtr.isEmpty())
+            MWBase::Environment::get().getMechanicsManager()->onClose(mPtr);
    }

    void ContainerWindow::onCloseButtonClicked(MyGUI::Widget* _sender)