From 8c94df30939811b0a0b7edca10b44e7e26141ff1 Mon Sep 17 00:00:00 2001 From: Stefan Date: Sat, 8 Feb 2020 18:16:31 +0100 Subject: [PATCH 1/2] Fix System.ArgumentOutOfRangeException Fixes #492 --- VocaluxeLib/Menu/CMenuPartySongSelection.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/VocaluxeLib/Menu/CMenuPartySongSelection.cs b/VocaluxeLib/Menu/CMenuPartySongSelection.cs index 41ecd0b6..5b8c95c2 100644 --- a/VocaluxeLib/Menu/CMenuPartySongSelection.cs +++ b/VocaluxeLib/Menu/CMenuPartySongSelection.cs @@ -224,7 +224,10 @@ namespace VocaluxeLib.Menu _SongMode = _SelectSlides[_SelectSlideSongMode].Selection; _Source = _SelectSlides[_SelectSlideSource].Selection; NumMedleySongs = NumMinMedleySongs + _SelectSlides[_SelectSlideNumMedleySongs].Selection; - Playlist = _PlaylistIDs[_SelectSlides[_SelectSlidePlaylist].Selection]; + if (_SelectSlides[_SelectSlidePlaylist].Selection >= 0) + Playlist = _PlaylistIDs[_SelectSlides[_SelectSlidePlaylist].Selection]; + else + Playlist = -1; if (_SelectSlides[_SelectSlideSorting].Selection != _Sorting) { From 49e1b4b947567cc5b6bc708358a7a0372efe41e7 Mon Sep 17 00:00:00 2001 From: Stefan Date: Sat, 8 Feb 2020 18:22:22 +0100 Subject: [PATCH 2/2] Made playlist selection checking nicer --- VocaluxeLib/Menu/CMenuPartySongSelection.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/VocaluxeLib/Menu/CMenuPartySongSelection.cs b/VocaluxeLib/Menu/CMenuPartySongSelection.cs index 5b8c95c2..44e609e9 100644 --- a/VocaluxeLib/Menu/CMenuPartySongSelection.cs +++ b/VocaluxeLib/Menu/CMenuPartySongSelection.cs @@ -224,8 +224,10 @@ namespace VocaluxeLib.Menu _SongMode = _SelectSlides[_SelectSlideSongMode].Selection; _Source = _SelectSlides[_SelectSlideSource].Selection; NumMedleySongs = NumMinMedleySongs + _SelectSlides[_SelectSlideNumMedleySongs].Selection; - if (_SelectSlides[_SelectSlidePlaylist].Selection >= 0) - Playlist = _PlaylistIDs[_SelectSlides[_SelectSlidePlaylist].Selection]; + + int playlistSelection = _SelectSlides[_SelectSlidePlaylist].Selection; + if (playlistSelection >= 0 && playlistSelection < _PlaylistIDs.Count) + Playlist = _PlaylistIDs[playlistSelection]; else Playlist = -1;