mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-28 20:09:42 +00:00
Code Issues Releases Wiki Activity

Catch exceptions in updateWindowManager (Bug #4269)

Browse source
This commit is contained in:
scrawl 2018-01-14 00:26:37 +00:00
parent 047c44f265
commit d9d8de3061
No known key found for this signature in database
GPG key ID: 2E6CC3676024C402
1 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
apps/openmw/mwworld/worldimp.cpp
View file

@ -1757,19 +1757,26 @@ namespace MWWorld
void World::updateWindowManager () void World::updateWindowManager ()
{ {
// inform the GUI about focused object try
MWWorld::Ptr object = getFacedObject ();
// retrieve object dimensions so we know where to place the floating label
if (!object.isEmpty ())
{ {
osg::Vec4f screenBounds = mRendering->getScreenBounds(object); // inform the GUI about focused object
MWWorld::Ptr object = getFacedObject ();
MWBase::Environment::get().getWindowManager()->setFocusObjectScreenCoords( // retrieve object dimensions so we know where to place the floating label
screenBounds.x(), screenBounds.y(), screenBounds.z(), screenBounds.w()); if (!object.isEmpty ())
{
osg::Vec4f screenBounds = mRendering->getScreenBounds(object);
MWBase::Environment::get().getWindowManager()->setFocusObjectScreenCoords(
screenBounds.x(), screenBounds.y(), screenBounds.z(), screenBounds.w());
}
MWBase::Environment::get().getWindowManager()->setFocusObject(object);
}
catch (std::exception& e)
{
std::cerr << "Error updating window manager: " << e.what() << std::endl;
} }
MWBase::Environment::get().getWindowManager()->setFocusObject(object);
} }
MWWorld::Ptr World::getFacedObject(float maxDistance, bool ignorePlayer) MWWorld::Ptr World::getFacedObject(float maxDistance, bool ignorePlayer)