[colobot] 249/377: Fixed SatCom music not starting with immediat SatCom enabled

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository colobot.

commit bdf99f3de5d1f039138aba3772254a636fb52ada
Author: krzys-h <krzys_h at interia.pl>
Date:   Fri Feb 5 20:38:03 2016 +0100

    Fixed SatCom music not starting with immediat SatCom enabled
---
 src/level/robotmain.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/level/robotmain.cpp b/src/level/robotmain.cpp
index deb61c9..99886f4 100644
--- a/src/level/robotmain.cpp
+++ b/src/level/robotmain.cpp
@@ -551,12 +551,12 @@ void CRobotMain::ChangePhase(Phase phase)
 
             m_app->ResetTimeAfterLoading();
 
+            m_sound->StopMusic(0.0f);
+            if (m_base == nullptr || loading) StartMusic();
+
             if (m_immediatSatCom && !loading  &&
                 m_infoFilename[SATCOM_HUSTON][0] != 0)
                 StartDisplayInfo(SATCOM_HUSTON, false);  // shows the instructions
-
-            m_sound->StopMusic(0.0f);
-            if (m_base == nullptr || loading) StartMusic();
         }
         catch (const std::runtime_error& e)
         {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.git