commit 3745cbe05070a2e303712cee9cd83594d84e71d9
Author:     Simon Howard <fraggle@gmail.com>
AuthorDate: Tue Sep 20 22:09:37 2011 +0000
Commit:     Simon Howard <fraggle@gmail.com>
CommitDate: Tue Sep 20 22:09:37 2011 +0000

    Display an error dialog if trying to connect to a server where a game is
    already in progress.

    Subversion-branch: /branches/v2-branch
    Subversion-revision: 2392
---
 src/setup/multiplayer.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/setup/multiplayer.c b/src/setup/multiplayer.c
index 5b3e8da0..da17ad12 100644
--- a/src/setup/multiplayer.c
+++ b/src/setup/multiplayer.c
@@ -776,6 +776,14 @@ static void SelectQueryAddress(TXT_UNCAST_ARG(button),
     TXT_CAST_ARG(net_querydata_t, querydata);
     int i;

+    if (querydata->server_state != 0)
+    {
+        TXT_MessageBox("Cannot connect to server",
+                       "Gameplay is already in progress\n"
+                       "on this server.");
+        return;
+    }
+
     // Set address to connect to:

     free(connect_address);