diff --git a/Output/Readme.txt b/Output/Readme.txt index f90f61ea..d6840537 100644 --- a/Output/Readme.txt +++ b/Output/Readme.txt @@ -26,7 +26,7 @@ Supported Operating Systems / Requirements: - Windows Vista, Windows 7, Windows 8 or Windows 10 with .NET 4.0 - Linux (no official support) - 1 GHz CPU, 512 MB RAM, Graphics card with OpenGL 2.1 or DirectX 9.0 support -- Visual C++ Redistributable Package 2010 +- Visual C++ Redistributable Package 2010 (2015-2022 is required for the nightly builds) ================================= diff --git a/README.md b/README.md index 8c0b75a6..cdc72c1b 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ Supported Operating Systems / Requirements: - Windows Vista, Windows 7, Windows 8, Windows 8.1 and Windows 10 with .NET 4.0 - *Linux* (no official support) - 1 GHz CPU, 512 MB RAM, Graphics card with OpenGL 2.1 or DirectX 9.0 support -- Visual C++ Redistributable Package 2010 +- Visual C++ Redistributable Package 2010 (2015-2022 is required for the nightly builds) ## 2. Download diff --git a/Vocaluxe/Screens/CScreenSing.cs b/Vocaluxe/Screens/CScreenSing.cs index 8e237bdd..1f29a202 100644 --- a/Vocaluxe/Screens/CScreenSing.cs +++ b/Vocaluxe/Screens/CScreenSing.cs @@ -328,21 +328,21 @@ namespace Vocaluxe.Screens song.Save(); break; - // Restart Round and reload song file header + // Restart Song and reload song from disk (not in party modes with multiple rounds) case Keys.R: - if (keyEvent.Mod == EModifier.Ctrl && _Pause) + if (keyEvent.Mod == EModifier.Ctrl && _Pause && CGame.NumRounds == 1) { + _RestartGame(); _SetPause(false); - _RestartRound(); } break; - // Restart Round and reload song file header + // Restart Song and reload song from disk (not in party modes with multiple rounds) case Keys.F5: - if (_Pause) + if (_Pause && CGame.NumRounds == 1) { + _RestartGame(); _SetPause(false); - _RestartRound(); } break; @@ -430,7 +430,15 @@ namespace Vocaluxe.Screens _SetPause(false); _TimeRects.Clear(); - _Sso = CParty.GetSongSelectionOptions(); + try + { + _Sso = CParty.GetSongSelectionOptions(); + } + catch (ArgumentException) + { + // Workaround to assume party mode here (TicTacToe party mode throw the ArgumentException) / Stefan1200 + _Sso.Selection.PartyMode = true; + } _SingNotes[_SingBars].Init(0); _AssignPlayerElements(); diff --git a/appveyor.yml b/appveyor.yml index ae906561..e4635c95 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -9,7 +9,7 @@ platform: clone_depth: 15 environment: GitHubKey: - secure: sGetWh2XUYs95VBT+QYNPtDW9Rh2/JBuxNNYXytpn7mMudUMcjSKDGErkCTum+ZE + secure: jBeNVwHNcDfeTHvEfCFFDZi7FW43xwTbjJhMTHtlQQIvj9t4GaIpif5pzbk24UO1 init: - git config --global core.autocrlf true install: @@ -136,7 +136,7 @@ deploy: release: $(APPVEYOR_REPO_TAG_NAME) description: $(APPVEYOR_REPO_COMMIT) auth_token: - secure: sGetWh2XUYs95VBT+QYNPtDW9Rh2/JBuxNNYXytpn7mMudUMcjSKDGErkCTum+ZE + secure: jBeNVwHNcDfeTHvEfCFFDZi7FW43xwTbjJhMTHtlQQIvj9t4GaIpif5pzbk24UO1 artifact: ReleaseZip prerelease: $(IS_BETA_RELEASE) on: @@ -148,7 +148,7 @@ deploy: release: Latest Nightly build description: $(APPVEYOR_REPO_COMMIT) auth_token: - secure: sGetWh2XUYs95VBT+QYNPtDW9Rh2/JBuxNNYXytpn7mMudUMcjSKDGErkCTum+ZE + secure: jBeNVwHNcDfeTHvEfCFFDZi7FW43xwTbjJhMTHtlQQIvj9t4GaIpif5pzbk24UO1 artifact: ReleaseZip prerelease: true on: