# HG changeset patch
# User a.parshin
# Date 1406140714 -10800
# Node ID 99e7bd7ec0a21f9d6d2d14df86369ee4a065d3ed
# Parent  a2d95b16e28b97e503bb4c3d01431c67b6f149b5
* Fixed OpenAL crash for videos
* Fixed double release of movie for Emerald Intro

diff -r a2d95b16e28b -r 99e7bd7ec0a2 Game.cpp
--- a/Game.cpp	Wed Jul 23 20:53:28 2014 +0300
+++ b/Game.cpp	Wed Jul 23 21:38:34 2014 +0300
@@ -4534,7 +4534,7 @@
           }
           if ( pCurrentScreen == SCREEN_VIDEO )
           {
-            pVideoPlayer->Unload();
+            //pVideoPlayer->Unload();
           }
           else
           {
diff -r a2d95b16e28b -r 99e7bd7ec0a2 MediaPlayer.cpp
--- a/MediaPlayer.cpp	Wed Jul 23 20:53:28 2014 +0300
+++ b/MediaPlayer.cpp	Wed Jul 23 21:38:34 2014 +0300
@@ -981,6 +981,7 @@
               __debugbreak();
           } while (!frameFinished);
         }
+        else __debugbreak(); // unknown stream
       }
       while (avpacket->stream_index != video.stream_idx ||
                avpacket->pts != desired_frame_number);
diff -r a2d95b16e28b -r 99e7bd7ec0a2 OpenALSoundProvider.h
--- a/OpenALSoundProvider.h	Wed Jul 23 20:53:28 2014 +0300
+++ b/OpenALSoundProvider.h	Wed Jul 23 21:38:34 2014 +0300
@@ -159,6 +159,7 @@
       }
 
       unsigned int al_source = -1;
+      alGetError();
       alGenSources(1, &al_source);
       if (CheckError())
         return nullptr;