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

Conflicts:
	VocaluxeLib/Menu/CNameSelection.cs
This commit is contained in:
Florian Küpper committed 2013-12-23 10:51:12 +01:00
commit c5104ee219
523 files changed
+834 -137

No files matched your search

+1 -1
View File
@@ -523,7 +523,7 @@ namespace VocaluxeLib.Menu
bool visible = profile.Active == EOffOn.TR_CONFIG_ON;
if (visible)
{
if (_UsedProfiles.Contains(profile.ID) && !profile.UserRole.HasFlag(EUserRole.TR_USERROLE_NORMAL))
if (_UsedProfiles.Contains(profile.ID) && profile.UserRole >= EUserRole.TR_USERROLE_NORMAL)
visible = false;
}
if (visible)