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

ClientServerLib/ClientServerLib/CServer.cs

@@ -205,13 +205,15 @@ namespace ServerLib
 
         public static string GetLocalAddress()
         {
-            IPAddress[] ips = Dns.GetHostAddresses(Dns.GetHostName());
+            return Dns.GetHostName();
+            
+            /*IPAddress[] ips = Dns.GetHostAddresses(Dns.GetHostName());
             foreach (IPAddress ip in ips)
             {
                 if (ip.AddressFamily == System.Net.Sockets.AddressFamily.InterNetwork)
                     return ip.ToString();
             }
-            return "";
+            return "";*/
         }
 
         #region server control

Vocaluxe/Base/Server/CVocaluxeServer.cs

@@ -678,9 +678,9 @@ namespace Vocaluxe.Base.Server
             }
 
             //Hide TR_USERROLE_GUEST and TR_USERROLE_NORMAL
-            const EUserRole mask = (EUserRole.TR_USERROLE_GUEST | EUserRole.TR_USERROLE_NORMAL);
+            //const EUserRole mask = (EUserRole.TR_USERROLE_GUEST | EUserRole.TR_USERROLE_NORMAL);
 
-            return (int)(profile.UserRole & ~mask);
+            return (int)(profile.UserRole);
         }
 
         private static void _SetUserRole(int profileId, int userRole)

VocaluxeLib/Menu/SongMenu/CSongMenuTileBoard.cs

@@ -198,18 +198,21 @@ namespace VocaluxeLib.Menu.SongMenu
 
         private void UpdateLength(CSong song)
         {
-            float time = CBase.Sound.GetLength(_PreviewSongStream);
-            if (Math.Abs(song.Finish) > 0.001)
-                time = song.Finish;
-
-            // The audiobackend is not yet ready to return the length
-            if (time > 0)
+            if (song != null)
             {
-                time -= song.Start;
-                var min = (int)Math.Floor(time / 60f);
-                var sec = (int)(time - min * 60f);
-                _SongLength.Text = min.ToString("00") + ":" + sec.ToString("00");
-                _Length = time;
+                float time = CBase.Sound.GetLength(_PreviewSongStream);
+                if (Math.Abs(song.Finish) > 0.001)
+                    time = song.Finish;
+
+                // The audiobackend is not yet ready to return the length
+                if (time > 0)
+                {
+                    time -= song.Start;
+                    var min = (int)Math.Floor(time / 60f);
+                    var sec = (int)(time - min * 60f);
+                    _SongLength.Text = min.ToString("00") + ":" + sec.ToString("00");
+                    _Length = time;
+                }
             }
         }