r4913 - in branches/nexuiz-2.0: . data/qcsrc/menu/nexuiz

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-10-27 07:08:20 -0400 (Mon, 27 Oct 2008)
New Revision: 4913

Modified:
   branches/nexuiz-2.0/.patchsets
   branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/serverlist.c
Log:
r4912 | div0 | 2008-10-27 12:06:40 +0100 (Mon, 27 Oct 2008) | 2 lines
add back connect button disabling

Modified: branches/nexuiz-2.0/.patchsets
===================================================================
--- branches/nexuiz-2.0/.patchsets	2008-10-27 11:06:40 UTC (rev 4912)
+++ branches/nexuiz-2.0/.patchsets	2008-10-27 11:08:20 UTC (rev 4913)
@@ -1,2 +1,2 @@
 master = svn://svn.icculus.org/nexuiz/trunk
-revisions_applied = 1-4910
+revisions_applied = 1-4912

Modified: branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/serverlist.c
===================================================================
--- branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/serverlist.c	2008-10-27 11:06:40 UTC (rev 4912)
+++ branches/nexuiz-2.0/data/qcsrc/menu/nexuiz/serverlist.c	2008-10-27 11:08:20 UTC (rev 4913)
@@ -242,6 +242,8 @@
 
 	me.nItems = gethostcachevalue(SLIST_HOSTCACHEVIEWCOUNT);
 
+	me.connectButton.disabled = ((me.nItems == 0) && (me.ipAddressBox.text == ""));
+
 	found = 0;
 	if(me.selectedServer)
 	{
@@ -440,7 +442,10 @@
 }
 void ServerList_Connect_Click(entity btn, entity me)
 {
-	localcmd("connect ", me.ipAddressBox.text, "\n");
+	if(me.ipAddressBox.text == "")
+		localcmd("connect ", me.selectedServer, "\n");
+	else
+		localcmd("connect ", me.ipAddressBox.text, "\n");
 }
 void ServerList_Favorite_Click(entity btn, entity me)
 {