# HG changeset patch # User a.parshin # Date 1406142596 -10800 # Node ID f1d8eba1a9aacb011c148067bea64b64a7283bfb # Parent 1eb352f7319ace30c0e951c5a07d07777021969b# Parent 9f30d514cdd218b17c64049b2f3e1745715e5b90 Merge diff -r 9f30d514cdd2 -r f1d8eba1a9aa GUIWindow.cpp --- a/GUIWindow.cpp Wed Jul 23 19:52:49 2014 +0100 +++ b/GUIWindow.cpp Wed Jul 23 22:09:56 2014 +0300 @@ -294,7 +294,7 @@ } case WINDOW_Transition: { - pVideoPlayer->Unload(); + //pVideoPlayer->Unload(); pTexture_outside->Release(); pTexture_Dialogue_Background->Release(); pIcons_LOD->SyncLoadedFilesCount();