Merge branch 'names-list' into 1.1-beta

1 files changed, 5 insertions, 5 deletions

diff --git a/Aktywator/Tournament.cs b/Aktywator/Tournament.cs
index 038fdbb..33ecd26 100644
--- a/Aktywator/Tournament.cs
+++ b/Aktywator/Tournament.cs
@@ -114,10 +114,6 @@ namespace Aktywator
         virtual internal string shortenNameToBWS(string name)
         {
             name = Common.bezOgonkow(name);
-            if (name.Length > 18)
-            {
-                name = name.Substring(0, 18);
-            }
             if ("pauza".Equals(name.Trim()))
             {
                 return " ";
@@ -131,7 +127,11 @@ namespace Aktywator
                     {
                         nameParts[0] = (nameParts[0].Length > 0) ? nameParts[0][0].ToString() : " ";
                     }
-                    return String.Join(" ", nameParts);
+                    name = String.Join(" ", nameParts);
+                }
+                if (name.Length > 18)
+                {
+                    name = name.Substring(0, 18);
                 }
                 return name;
             }