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

This commit is contained in:
Florian Kuepper committed 2012-12-24 10:17:06 +01:00
commit 9bbffd681d
1 file changed
+6 -2
@@ -581,7 +581,9 @@ namespace Vocaluxe.PartyModes
private void ScrollPlayerTable(int Offset)
{
if (Offset < 0 && PlayerTableOffset + Offset >= 0)
if (GameState.ProfileIDs.Count <= NumPlayerVisible)
PlayerTableOffset = 0;
else if (Offset < 0 && PlayerTableOffset + Offset >= 0)
PlayerTableOffset += Offset;
else if (Offset < 0 && PlayerTableOffset + Offset < 0)
PlayerTableOffset = 0;
@@ -595,7 +597,9 @@ namespace Vocaluxe.PartyModes
private void ScrollRoundsTable(int Offset)
{
if (Offset < 0 && RoundsTableOffset + Offset >= 0)
if (GameState.Combs.Count <= NumRoundsVisible)
RoundsTableOffset = 0;
else if (Offset < 0 && RoundsTableOffset + Offset >= 0)
RoundsTableOffset += Offset;
else if (Offset < 0 && RoundsTableOffset + Offset < 0)
RoundsTableOffset = 0;