First fixes for party-mode.

This commit is contained in:
Florian Küpper committed 2014-12-05 17:11:36 +01:00
1 parent ca5d607937
commit 58df2a0408
1 file changed
+4 -3
@@ -187,7 +187,7 @@ namespace VocaluxeLib.PartyModes.TicTacToe
case EStage.Main: case EStage.Main:
return _Screens["CPartyScreenTicTacToeMain"]; return _Screens["CPartyScreenTicTacToeMain"];
case EStage.Singing: case EStage.Singing:
return CBase.Graphics.GetScreen(EScreen.Song); return CBase.Graphics.GetScreen(EScreen.Sing);
default: default:
throw new ArgumentException("Invalid stage: " + _Stage); throw new ArgumentException("Invalid stage: " + _Stage);
} }
@@ -195,7 +195,8 @@ namespace VocaluxeLib.PartyModes.TicTacToe
private void _FadeToScreen() private void _FadeToScreen()
{ {
CBase.Graphics.FadeTo(_GetNextScreen()); if(CBase.Graphics.GetNextScreen() != _GetNextScreen())
CBase.Graphics.FadeTo(_GetNextScreen());
} }
public void Next() public void Next()
@@ -242,7 +243,7 @@ namespace VocaluxeLib.PartyModes.TicTacToe
_Stage = EStage.Config; _Stage = EStage.Config;
break; break;
case EStage.Main: case EStage.Main:
_Stage = EStage.Config; _Stage = EStage.Names;
break; break;
default: // Rest is not allowed default: // Rest is not allowed
throw new ArgumentException("Invalid stage: " + _Stage); throw new ArgumentException("Invalid stage: " + _Stage);