Merge remote-tracking branch 'origin/terencehill/HUD_config_string_fix'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / menu / xonotic / dialog_multiplayer_join_serverinfo.c

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.c b/qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.c
index 33a06b7bc98d4c3ba8ce08fcc12efd91cf46148a..4e6d6f5909ea7181374a4b8a7695cf77df0b6b55 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.c
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_join_serverinfo.c
@@ -154,8 +154,7 @@ void XonoticServerInfoDialog_loadServerInfo(entity me, float i)
 
        s = gethostcachestring(SLIST_FIELD_MOD, i);
        if(s != "data")
-               if(modname == "Xonotic")
-                       modname = s;
+               modname = sprintf(_("%s (%s)"), modname, s);
 
        j = MapInfo_Type_FromString(typestr); // try and get the real name of the game type
        if(j) { typestr = MapInfo_Type_ToText(j); } // only set it if we actually found it
@@ -185,7 +184,7 @@ void XonoticServerInfoDialog_loadServerInfo(entity me, float i)
        me.numFreeSlotsLabel.setText(me.numFreeSlotsLabel, me.currentServerNumFreeSlots);
 
        me.currentServerMod = ((modname == "Xonotic") ? _("Default") : modname);
-       me.currentServerMod = strzone(modname);
+       me.currentServerMod = strzone(me.currentServerMod);
        me.modLabel.setText(me.modLabel, me.currentServerMod);
 
        me.currentServerVersion = strzone(versionstr);