Merge branch 'develop' of github.com:Vocaluxe/Vocaluxe into develop

This commit is contained in:
Florian Kuepper committed 2012-12-23 22:40:26 +01:00
commit 62429dc05f
7 files changed
+106 -98

No files matched your search

+11 -2
View File
@@ -452,10 +452,10 @@ namespace Vocaluxe.PartyModes
for (int i = 0; i < Table.Count; i++)
{
TableRow row = Table[i];
if (i < GameState.ResultTable.Count)
{
TableRow row = Table[i];
row.Pos.Visible = true;
row.Name.Visible = true;
row.Rounds.Visible = true;
@@ -469,6 +469,15 @@ namespace Vocaluxe.PartyModes
row.SingPoints.Text = GameState.ResultTable[i].SumSingPoints.ToString();
row.GamePoints.Text = GameState.ResultTable[i].NumGamePoints.ToString();
}
else
{
row.Pos.Visible = false;
row.Name.Visible = false;
row.Rounds.Visible = false;
row.Won.Visible = false;
row.SingPoints.Visible = false;
row.GamePoints.Visible = false;
}
}
}
}
@@ -402,8 +402,8 @@ namespace Vocaluxe.PartyModes
for (int p = 0; p < Data.ScreenNames.ProfileIDs.Count; p++)
{
//Don't show profile if is selected, but if selected and guest
if (Data.ScreenNames.ProfileIDs[p] == i && _Base.Profiles.GetProfiles()[i].GuestProfile == EOffOn.TR_CONFIG_OFF)
//Don't show profile if is selected
if (Data.ScreenNames.ProfileIDs[p] == i)
{
visible = false;
break;