Background music was playing after screen fading when stopped
Background music can now be stopped in loadscreen
This commit is contained in:
1 parent
cd6fbfb983
commit
dbb4b23db0
2 files changed
+7
-3
No files matched your search
@@ -385,7 +385,8 @@ namespace Vocaluxe.Menu
|
|||||||
_Screens[(int)_CurrentScreen].OnClose();
|
_Screens[(int)_CurrentScreen].OnClose();
|
||||||
_CurrentScreen = _NextScreen;
|
_CurrentScreen = _NextScreen;
|
||||||
_NextScreen = EScreens.ScreenNull;
|
_NextScreen = EScreens.ScreenNull;
|
||||||
CBackgroundMusic.Play();
|
if(CBackgroundMusic.Playing)
|
||||||
|
CBackgroundMusic.Play();
|
||||||
_Screens[(int)_CurrentScreen].OnShowFinish();
|
_Screens[(int)_CurrentScreen].OnShowFinish();
|
||||||
_Screens[(int)_CurrentScreen].ProcessMouseMove(_Cursor.X, _Cursor.Y);
|
_Screens[(int)_CurrentScreen].ProcessMouseMove(_Cursor.X, _Cursor.Y);
|
||||||
_Screens[(int)_CurrentScreen].Draw();
|
_Screens[(int)_CurrentScreen].Draw();
|
||||||
|
|||||||
@@ -120,6 +120,9 @@ namespace Vocaluxe.Screens
|
|||||||
_Intros[i].Load(IntroVideo[i]);
|
_Intros[i].Load(IntroVideo[i]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!CBackgroundMusic.Playing)
|
||||||
|
CBackgroundMusic.Next();
|
||||||
}
|
}
|
||||||
|
|
||||||
public override void OnShowFinish()
|
public override void OnShowFinish()
|
||||||
@@ -173,8 +176,8 @@ namespace Vocaluxe.Screens
|
|||||||
{
|
{
|
||||||
CBackgroundMusic.AddOwnMusic();
|
CBackgroundMusic.AddOwnMusic();
|
||||||
|
|
||||||
if (!CBackgroundMusic.Playing)
|
//if (!CBackgroundMusic.Playing)
|
||||||
CBackgroundMusic.Next();
|
// CBackgroundMusic.Next();
|
||||||
}
|
}
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
|
|||||||
Reference in new issue
Block a user