From 59808d1f9fdaf7f5d44dd598eefbfbb9da4e3a73 Mon Sep 17 00:00:00 2001 From: Stefan Date: Sun, 19 Jan 2020 09:51:31 +0100 Subject: [PATCH] Disable reloading song while party mode is active --- Vocaluxe/Screens/CScreenSing.cs | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Vocaluxe/Screens/CScreenSing.cs b/Vocaluxe/Screens/CScreenSing.cs index 11009b7d..be339a17 100644 --- a/Vocaluxe/Screens/CScreenSing.cs +++ b/Vocaluxe/Screens/CScreenSing.cs @@ -30,6 +30,7 @@ using VocaluxeLib.Draw; using VocaluxeLib.Log; using VocaluxeLib.Menu; using VocaluxeLib.Menu.SingNotes; +using VocaluxeLib.PartyModes; using VocaluxeLib.Songs; namespace Vocaluxe.Screens @@ -133,6 +134,7 @@ namespace Vocaluxe.Screens private bool _Webcam; private CBackground _SlideShow; + private SScreenSongOptions _Sso; public override EMusicType CurrentMusicType { @@ -309,8 +311,7 @@ namespace Vocaluxe.Screens // Skip 30 seconds case Keys.Right: - SScreenSongOptions Sso = CParty.GetSongSelectionOptions(); - if (keyEvent.Mod == EModifier.Ctrl && !_Pause && !Sso.Selection.PartyMode) + if (keyEvent.Mod == EModifier.Ctrl && !_Pause && !_Sso.Selection.PartyMode) { if (_TimerSongText.IsRunning) _TimerSongText.Stop(); @@ -390,6 +391,7 @@ namespace Vocaluxe.Screens _SetPause(false); _TimeRects.Clear(); + _Sso = CParty.GetSongSelectionOptions(); _SingNotes[_SingBars].Init(0); _AssignPlayerElements(); @@ -1092,7 +1094,9 @@ namespace Vocaluxe.Screens return; } - song.ReloadSong(reloadNotes); + if (!_Sso.Selection.PartyMode) + song.ReloadSong(reloadNotes); + string songname = song.Artist + " - " + song.Title; int rounds = CGame.GetNumSongs(); if (rounds > 1)