From 98064a98a09952a19cafeed3ce656e91db8c6f7e Mon Sep 17 00:00:00 2001 From: Stefan Date: Thu, 23 Sep 2021 03:02:42 +0200 Subject: [PATCH] Fix reloading songs with F5 & CTRL+R key shortcuts --- Vocaluxe/Screens/CScreenSing.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Vocaluxe/Screens/CScreenSing.cs b/Vocaluxe/Screens/CScreenSing.cs index 8e237bdd..8b2f8734 100644 --- a/Vocaluxe/Screens/CScreenSing.cs +++ b/Vocaluxe/Screens/CScreenSing.cs @@ -328,21 +328,21 @@ namespace Vocaluxe.Screens song.Save(); 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: - if (keyEvent.Mod == EModifier.Ctrl && _Pause) + if (keyEvent.Mod == EModifier.Ctrl && _Pause && CGame.NumRounds == 1) { + _RestartGame(); _SetPause(false); - _RestartRound(); } 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: - if (_Pause) + if (_Pause && CGame.NumRounds == 1) { + _RestartGame(); _SetPause(false); - _RestartRound(); } break;