# HG changeset patch
# User Grumpy7
# Date 1406157096 -7200
# Node ID 135b2116db9d03c85336edbcf6ad9380a135e59f
# Parent  2b10278bc7ac41467c45fb8c80fa8a666eaffe1b# Parent  daf7807d0a8632be0eac7ffc5a29fac5bde85556
Merge

diff -r 2b10278bc7ac -r 135b2116db9d Game.cpp
--- a/Game.cpp	Thu Jul 24 01:10:50 2014 +0200
+++ b/Game.cpp	Thu Jul 24 01:11:36 2014 +0200
@@ -2614,7 +2614,9 @@
           dword_50CDC8 = 1;
           sub_42FBDD();
           PlayHouseSound(uCurrentHouse_Animation, HouseSound_NotEnoughMoney_TrainingSuccessful);
-          pVideoPlayer->Unload();
+
+          if (pVideoPlayer->AnyMovieLoaded())
+            pVideoPlayer->Unload();
           DialogueEnding();
           viewparams->bRedrawGameUI = true;
           if ( dword_59117C_teleportx | dword_591178_teleporty | dword_591174_teleportz | dword_591170_teleport_directiony | dword_59116C_teleport_directionx | dword_591168_teleport_speedz )
diff -r 2b10278bc7ac -r 135b2116db9d VideoPlayer.cpp
--- a/VideoPlayer.cpp	Thu Jul 24 01:10:50 2014 +0200
+++ b/VideoPlayer.cpp	Thu Jul 24 01:11:36 2014 +0200
@@ -353,10 +353,11 @@
 //----- (004BF3F9) --------------------------------------------------------
 bool VideoPlayer::AnyMovieLoaded()
 {
-  if (pMovie_Track)
+  return pMovie_Track != 0;
+  /*if (pMovie_Track)
 	return pMovie_Track;// pSmackerMovie || pBinkMovie;
   else
-	  return false;
+	  return false;*/
 }
 
 //----- (004BF411) --------------------------------------------------------