From 64c0b392a90168137cbd2d8ae0e695063d6f4d79 Mon Sep 17 00:00:00 2001 From: Stefan Date: Sun, 19 Jan 2020 09:29:54 +0100 Subject: [PATCH] Removing two "Code Smells" --- Vocaluxe/Screens/CScreenSing.cs | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-) diff --git a/Vocaluxe/Screens/CScreenSing.cs b/Vocaluxe/Screens/CScreenSing.cs index dab2ce04..843d7532 100644 --- a/Vocaluxe/Screens/CScreenSing.cs +++ b/Vocaluxe/Screens/CScreenSing.cs @@ -291,13 +291,10 @@ namespace Vocaluxe.Screens // Restart Round and reload song file header case Keys.R: - if (keyEvent.Mod == EModifier.Ctrl) + if (keyEvent.Mod == EModifier.Ctrl && _Pause) { - if (_Pause) - { - _SetPause(false); - _RestartRound(); - } + _SetPause(false); + _RestartRound(); } break; @@ -312,18 +309,15 @@ namespace Vocaluxe.Screens // Skip 30 seconds case Keys.Right: - if (keyEvent.Mod == EModifier.Ctrl) + if (keyEvent.Mod == EModifier.Ctrl && !_Pause) { - if (!_Pause) - { - if (_TimerSongText.IsRunning) - _TimerSongText.Stop(); + if (_TimerSongText.IsRunning) + _TimerSongText.Stop(); - float newTime = _CurrentTime + 30f; - if (CSound.GetLength(_CurrentStream) < (_CurrentTime + 30f)) - newTime = CSound.GetLength(_CurrentStream) - 1f; - CSound.SetPosition(_CurrentStream, newTime); - } + float newTime = _CurrentTime + 30f; + if (CSound.GetLength(_CurrentStream) < (_CurrentTime + 30f)) + newTime = CSound.GetLength(_CurrentStream) - 1f; + CSound.SetPosition(_CurrentStream, newTime); } break; }