From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Tue, 1 Apr 2008 11:41:33 +0000 (+0000)
Subject: fixed Sys_Error popups in -dedicated console setup code so that they
X-Git-Tag: xonotic-v0.1.0preview~2289
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=fd8eacf626644fd3b253da5b8177e6d5cd580ce5;p=xonotic%2Fdarkplaces.git

fixed Sys_Error popups in -dedicated console setup code so that they
actually do appear (by forcing cls.state to ca_disconnected)


git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@8239 d7cf8633-e32d-0410-b094-e92efae38249
---

diff --git a/sys_win.c b/sys_win.c
index be6fac21..554ffd7d 100644
--- a/sys_win.c
+++ b/sys_win.c
@@ -207,20 +207,28 @@ char *Sys_ConsoleInput (void)
 	if (cls.state != ca_dedicated)
 		return NULL;
 
-
 	for ( ;; )
 	{
 		if (!GetNumberOfConsoleInputEvents (hinput, &numevents))
-			Sys_Error ("Error getting # of console events");
+		{
+			cls.state = ca_disconnected;
+			Sys_Error ("Error getting # of console events (error code %x)", (unsigned int)GetLastError());
+		}
 
 		if (numevents <= 0)
 			break;
 
 		if (!ReadConsoleInput(hinput, recs, 1, &numread))
-			Sys_Error ("Error reading console input");
+		{
+			cls.state = ca_disconnected;
+			Sys_Error ("Error reading console input (error code %x)", (unsigned int)GetLastError());
+		}
 
 		if (numread != 1)
-			Sys_Error ("Couldn't read console input");
+		{
+			cls.state = ca_disconnected;
+			Sys_Error ("Couldn't read console input (error code %x)", (unsigned int)GetLastError());
+		}
 
 		if (recs[0].EventType == KEY_EVENT)
 		{
@@ -317,9 +325,10 @@ void Sys_InitConsole (void)
 	{
 		//if ((houtput == 0) || (houtput == INVALID_HANDLE_VALUE)) // LordHavoc: on Windows XP this is never 0 or invalid, but hinput is invalid
 		{
-		    AllocConsole ();
-		    houtput = GetStdHandle (STD_OUTPUT_HANDLE);
-		    hinput = GetStdHandle (STD_INPUT_HANDLE);
+			if (!AllocConsole ())
+				Sys_Error ("Couldn't create dedicated server console (error code %x)", (unsigned int)GetLastError());
+			houtput = GetStdHandle (STD_OUTPUT_HANDLE);
+			hinput = GetStdHandle (STD_INPUT_HANDLE);
 		}
 		if ((houtput == 0) || (houtput == INVALID_HANDLE_VALUE))
 			Sys_Error ("Couldn't create dedicated server console");