# HG changeset patch
# User a.parshin
# Date 1412872315 -10800
# Node ID b71d0e7837ac5ebac838650911745760dc0f4b76
# Parent  8e2022a843d9d523241bcd3051a644a338cabea7# Parent  9f7908a4d8e6c3ddfa4ee0e003ef269de5ab70f5
Слияние

diff -r 8e2022a843d9 -r b71d0e7837ac Engine/MMT.cpp
--- a/Engine/MMT.cpp	Thu Oct 09 19:30:22 2014 +0300
+++ b/Engine/MMT.cpp	Thu Oct 09 19:31:55 2014 +0300
@@ -43,17 +43,15 @@
       pMediaPlayer->PlayFullscreenMovie(MOVIE_NWCLogo, true);
       if ( !pMediaPlayer->bStopBeforeSchedule )
       {
-
-        if (for_refactoring)
+        if ( !pMediaPlayer->bStopBeforeSchedule )
         {
-          MessageBoxA(nullptr, "Ritor1: MOVIE_JVC crash", "", 0);
-          __debugbreak();
+          pMediaPlayer->PlayFullscreenMovie(MOVIE_JVC, true);
+          if ( !pMediaPlayer->bStopBeforeSchedule )
+          {
+            if (!use_MMT)
+              pMediaPlayer->PlayFullscreenMovie(MOVIE_Intro, true);
+          }
         }
-
-        //pMediaPlayer->PlayFullscreenMovie(MOVIE_JVC, true);
-        //if ( !pMediaPlayer->bStopBeforeSchedule )
-        if (!use_MMT)
-          pMediaPlayer->PlayFullscreenMovie(MOVIE_Intro, true);
       }
     }
   }