From b78df16eea8e353c29e9ff1a065f727edbcb6863 Mon Sep 17 00:00:00 2001 From: Stefan Date: Sat, 11 Jan 2020 09:28:40 +0100 Subject: [PATCH 1/5] Select random song for next round Make sure, that a random song will be picked after a song was sung while a all songs challenge is running. --- PartyModes/PartyModeChallenge/CPartyModeChallenge.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/PartyModes/PartyModeChallenge/CPartyModeChallenge.cs b/PartyModes/PartyModeChallenge/CPartyModeChallenge.cs index 46260e8c..da556692 100644 --- a/PartyModes/PartyModeChallenge/CPartyModeChallenge.cs +++ b/PartyModes/PartyModeChallenge/CPartyModeChallenge.cs @@ -427,6 +427,7 @@ namespace VocaluxeLib.PartyModes.Challenge _ScreenSongOptions.Sorting.Tabs = CBase.Config.GetTabs(); _ScreenSongOptions.Sorting.FilterPlaylistID = -1; + _ScreenSongOptions.Selection.SongIndex = -1; _ScreenSongOptions.Selection.CategoryIndex = -1; _ScreenSongOptions.Selection.CategoryChangeAllowed = true; break; @@ -718,4 +719,4 @@ namespace VocaluxeLib.PartyModes.Challenge return result; } } -} \ No newline at end of file +} From 964336abcc6a5105c92b8d2a6298fba9cd49b6cc Mon Sep 17 00:00:00 2001 From: lukeIam <2lukeiam@gmail.com> Date: Sat, 11 Jan 2020 10:43:10 +0100 Subject: [PATCH 2/5] Fix: Token of VocaluxeBuildBot for github access was revoked due to inactivity --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 4774c28d..9b05da5d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -9,7 +9,7 @@ platform: clone_depth: 15 environment: GitHubKey: - secure: JSlN/em0JdspVn8jwaQ4IjugY6OQi0au4Qq0rhctJmcfGMaEGnUAOmDFULI48REW + secure: sGetWh2XUYs95VBT+QYNPtDW9Rh2/JBuxNNYXytpn7mMudUMcjSKDGErkCTum+ZE init: - git config --global core.autocrlf true install: From a0c49c14d7ba7e86e1b5e21161fa349e7a794d6a Mon Sep 17 00:00:00 2001 From: lukeIam <2lukeiam@gmail.com> Date: Sat, 11 Jan 2020 10:57:16 +0100 Subject: [PATCH 3/5] Empty commit to test ci build From 405e41da6749e691481ce165b8bc1b3775ee90a5 Mon Sep 17 00:00:00 2001 From: daggeg Date: Sat, 11 Jan 2020 12:49:38 +0100 Subject: [PATCH 4/5] Update CPartyModeChallenge.cs --- PartyModes/PartyModeChallenge/CPartyModeChallenge.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/PartyModes/PartyModeChallenge/CPartyModeChallenge.cs b/PartyModes/PartyModeChallenge/CPartyModeChallenge.cs index da556692..518f3817 100644 --- a/PartyModes/PartyModeChallenge/CPartyModeChallenge.cs +++ b/PartyModes/PartyModeChallenge/CPartyModeChallenge.cs @@ -428,7 +428,6 @@ namespace VocaluxeLib.PartyModes.Challenge _ScreenSongOptions.Sorting.FilterPlaylistID = -1; _ScreenSongOptions.Selection.SongIndex = -1; - _ScreenSongOptions.Selection.CategoryIndex = -1; _ScreenSongOptions.Selection.CategoryChangeAllowed = true; break; From 281bed8db93e494454ea7971590d62c90f9cd117 Mon Sep 17 00:00:00 2001 From: Stefan Date: Sat, 11 Jan 2020 14:34:45 +0100 Subject: [PATCH 5/5] Update CPartyModeChallenge.cs --- PartyModes/PartyModeChallenge/CPartyModeChallenge.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/PartyModes/PartyModeChallenge/CPartyModeChallenge.cs b/PartyModes/PartyModeChallenge/CPartyModeChallenge.cs index 518f3817..da556692 100644 --- a/PartyModes/PartyModeChallenge/CPartyModeChallenge.cs +++ b/PartyModes/PartyModeChallenge/CPartyModeChallenge.cs @@ -428,6 +428,7 @@ namespace VocaluxeLib.PartyModes.Challenge _ScreenSongOptions.Sorting.FilterPlaylistID = -1; _ScreenSongOptions.Selection.SongIndex = -1; + _ScreenSongOptions.Selection.CategoryIndex = -1; _ScreenSongOptions.Selection.CategoryChangeAllowed = true; break;