teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

[Client] If in a container, don't crash when teleported to another cell

Browse source
This commit is contained in:
David Cernat 2017-02-21 01:01:30 +02:00
parent f5470e0b49
commit bf2f932e18
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/openmw/mwmp/LocalPlayer.cpp
View file

@ -798,6 +798,12 @@ void LocalPlayer::setCell()
MWWorld::Ptr player = world->getPlayerPtr(); MWWorld::Ptr player = world->getPlayerPtr();
ESM::Position pos; ESM::Position pos;
// To avoid crashes, close any container menus this player may be in
if (MWBase::Environment::get().getWindowManager()->containsMode(MWGui::GM_Container))
{
MWBase::Environment::get().getWindowManager()->removeGuiMode(MWGui::GM_Container);
}
world->getPlayer().setTeleported(true); world->getPlayer().setTeleported(true);
int x = cell.mData.mX; int x = cell.mData.mX;