From bd936175668fcd3f47c79f4f3ba554eccba54168 Mon Sep 17 00:00:00 2001 From: Alexander Eckart Date: Sun, 12 Aug 2012 15:39:33 +0200 Subject: [PATCH] fixed crashing when adding songs to playlist by key --- Vocaluxe/Screens/CScreenSong.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Vocaluxe/Screens/CScreenSong.cs b/Vocaluxe/Screens/CScreenSong.cs index 38d0431f..a8c0481c 100644 --- a/Vocaluxe/Screens/CScreenSong.cs +++ b/Vocaluxe/Screens/CScreenSong.cs @@ -80,7 +80,8 @@ namespace Vocaluxe.Screens public override bool HandleInput(KeyEvent KeyEvent) { - if (Playlists[htPlaylists(Playlist)].HandleInput(KeyEvent)) + KeyEvent.Handled = Playlists[htPlaylists(Playlist)].HandleInput(KeyEvent); + if (KeyEvent.Handled) return true; base.HandleInput(KeyEvent); @@ -89,7 +90,6 @@ namespace Vocaluxe.Screens if (!_SongOptionsActive) { - if (KeyEvent.KeyPressed && !Char.IsControl(KeyEvent.Unicode)) { if (_SearchActive) @@ -211,7 +211,7 @@ namespace Vocaluxe.Screens if (SelectSlides[htSelectSlides(SelectSlideOptionsPlaylist)].Selection - 1 < 0) Playlists[htPlaylists(Playlist)].ActivePlaylistID = CPlaylists.NewPlaylist(); else - Playlists[htPlaylists(Playlist)].ActivePlaylistID = SelectSlides[htSelectSlides(SelectSlideOptionsPlaylist)].Selection; + Playlists[htPlaylists(Playlist)].ActivePlaylistID = SelectSlides[htSelectSlides(SelectSlideOptionsPlaylist)].Selection - 1; CPlaylists.Playlists[Playlists[htPlaylists(Playlist)].ActivePlaylistID].AddSong(CSongs.VisibleSongs[SongMenus[htSongMenus(SongMenu)].GetSelectedSong()].ID); OpenPlaylist(Playlists[htPlaylists(Playlist)].ActivePlaylistID); }