From e2552b83d4bb13feb5be493f00c3d10c69974d2f Mon Sep 17 00:00:00 2001 From: Alexander Eckart Date: Sun, 2 Dec 2012 22:21:30 +0100 Subject: [PATCH] do not interrupt searching --- Vocaluxe/Screens/CScreenSong.cs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Vocaluxe/Screens/CScreenSong.cs b/Vocaluxe/Screens/CScreenSong.cs index 58ca96ad..09239a8c 100644 --- a/Vocaluxe/Screens/CScreenSong.cs +++ b/Vocaluxe/Screens/CScreenSong.cs @@ -185,7 +185,8 @@ namespace Vocaluxe.Screens break; case Keys.Space: - ToggleSongOptions(ESongOptionsView.General); + if (!_SearchActive) + ToggleSongOptions(ESongOptionsView.General); break; case Keys.F3: @@ -232,7 +233,7 @@ namespace Vocaluxe.Screens //TODO: We need another key for random! case Keys.R: - if (CSongs.Category != -1 && KeyEvent.Mod == Modifier.Ctrl) + if (!_SearchActive && CSongs.Category != -1 && KeyEvent.Mod == Modifier.Ctrl) { SongMenus[htSongMenus(SongMenu)].SetSelectedSong(CSongs.GetRandomSong()); } @@ -240,7 +241,7 @@ namespace Vocaluxe.Screens //TODO: Delete that! case Keys.S: - if (CSongs.NumVisibleSongs > 0) + if (!_SearchActive && CSongs.NumVisibleSongs > 0) StartMedleySong(SongMenus[htSongMenus(SongMenu)].GetSelectedSong()); break; }