# HG changeset patch
# User Grumpy7
# Date 1406147113 -7200
# Node ID ea7748f4dc6022b0b11499e90984262b1f48ce92
# Parent  ed1e4cff79a27d60c4db87ed93544b9120bf8163# Parent  f1d8eba1a9aacb011c148067bea64b64a7283bfb
Merge

diff -r ed1e4cff79a2 -r ea7748f4dc60 GUIWindow.cpp
--- a/GUIWindow.cpp	Wed Jul 23 22:24:53 2014 +0200
+++ b/GUIWindow.cpp	Wed Jul 23 22:25:13 2014 +0200
@@ -294,7 +294,7 @@
 		}
 	case WINDOW_Transition:
 		{
-		pVideoPlayer->Unload();
+		//pVideoPlayer->Unload();
 		pTexture_outside->Release();
 		pTexture_Dialogue_Background->Release();
 		pIcons_LOD->SyncLoadedFilesCount();