Catch exceptions in updateWindowManager (Bug #4269)

0.6.3
scrawl 7 years ago
parent 047c44f265
commit d9d8de3061
No known key found for this signature in database
GPG Key ID: 2E6CC3676024C402

@ -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()->setFocusObject(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;
}
} }
MWWorld::Ptr World::getFacedObject(float maxDistance, bool ignorePlayer) MWWorld::Ptr World::getFacedObject(float maxDistance, bool ignorePlayer)

Loading…
Cancel
Save