From cefa20bfb94a8d5d8301bdc0f8aca5109a655c53 Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Thu, 5 Jun 2014 15:39:08 +0200
Subject: [PATCH] Fix not reacting to quit request while video is playing

---
 apps/openmw/mwgui/videowidget.cpp      | 5 +++++
 apps/openmw/mwgui/videowidget.hpp      | 3 +++
 apps/openmw/mwgui/windowmanagerimp.cpp | 3 ++-
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/apps/openmw/mwgui/videowidget.cpp b/apps/openmw/mwgui/videowidget.cpp
index 566c7cadbb..8430c1c7bc 100644
--- a/apps/openmw/mwgui/videowidget.cpp
+++ b/apps/openmw/mwgui/videowidget.cpp
@@ -42,4 +42,9 @@ bool VideoWidget::update()
     return mPlayer.isPlaying();
 }
 
+void VideoWidget::cleanup()
+{
+    mPlayer.close();
+}
+
 }
diff --git a/apps/openmw/mwgui/videowidget.hpp b/apps/openmw/mwgui/videowidget.hpp
index 16a71d367d..9360c8359f 100644
--- a/apps/openmw/mwgui/videowidget.hpp
+++ b/apps/openmw/mwgui/videowidget.hpp
@@ -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;
 
diff --git a/apps/openmw/mwgui/windowmanagerimp.cpp b/apps/openmw/mwgui/windowmanagerimp.cpp
index 4de3028ed4..94001d8777 100644
--- a/apps/openmw/mwgui/windowmanagerimp.cpp
+++ b/apps/openmw/mwgui/windowmanagerimp.cpp
@@ -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);