Projects/Vocaluxe
2
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into Stefan1200-de-CParty_ArgumentException

Browse Source
This commit is contained in:
Stefan authored and GitHub committed 2021-09-23 13:18:37 +02:00
2 parents 30cf1c356d b9922a3b0b
commit dd39064fbd
1 file changed
+6 -6
Download Patch File Download Diff File Expand all files Collapse all files
Vocaluxe/Screens/CScreenSing.cs
+6 -6
View File
@@ -328,21 +328,21 @@ namespace Vocaluxe.Screens
song.Save(); song.Save();
break; break;
// Restart Round and reload song file header // Restart Song and reload song from disk (not in party modes with multiple rounds)
case Keys.R: case Keys.R:
if (keyEvent.Mod == EModifier.Ctrl && _Pause) if (keyEvent.Mod == EModifier.Ctrl && _Pause && CGame.NumRounds == 1)
{ {
_RestartGame();
_SetPause(false); _SetPause(false);
_RestartRound();
} }
break; break;
// Restart Round and reload song file header // Restart Song and reload song from disk (not in party modes with multiple rounds)
case Keys.F5: case Keys.F5:
if (_Pause) if (_Pause && CGame.NumRounds == 1)
{ {
_RestartGame();
_SetPause(false); _SetPause(false);
_RestartRound();
} }
break; break;