1
0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-07 12:54:00 +00:00

Fix not reacting to quit request while video is playing

This commit is contained in:
scrawl 2014-06-05 15:39:08 +02:00
parent c0f1449004
commit cefa20bfb9
3 changed files with 10 additions and 1 deletions

View File

@ -42,4 +42,9 @@ bool VideoWidget::update()
return mPlayer.isPlaying();
}
void VideoWidget::cleanup()
{
mPlayer.close();
}
}

View File

@ -26,6 +26,9 @@ namespace MWGui
/// @return Is the video still playing?
bool update();
/// Free video player resources (done automatically on destruction)
void cleanup();
private:
bool mAllowSkipping;

View File

@ -1576,12 +1576,13 @@ namespace MWGui
bool cursorWasVisible = mCursorVisible;
setCursorVisible(false);
while (mVideoWidget->update())
while (mVideoWidget->update() && !MWBase::Environment::get().getStateManager()->hasQuitRequest())
{
MWBase::Environment::get().getInputManager()->update(0, true, false);
mRendering->getWindow()->update();
}
mVideoWidget->cleanup();
setCursorVisible(cursorWasVisible);