From: Rudolf Polzer <divverent@alientrap.org>
Date: Fri, 26 Nov 2010 19:49:36 +0000 (+0100)
Subject: catch errors
X-Git-Tag: xonotic-v0.1.0preview~100
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=64ddbee7cf616535317f0367feb3dc106cdaaa42;p=xonotic%2Fxonotic-data.pk3dir.git

catch errors
---

diff --git a/qcsrc/menu/gamecommand.qc b/qcsrc/menu/gamecommand.qc
index 03e863e27..104c8840e 100644
--- a/qcsrc/menu/gamecommand.qc
+++ b/qcsrc/menu/gamecommand.qc
@@ -132,6 +132,7 @@ void GameCommand(string theCommand)
 		float i, j;
 		string url;
 		float buf;
+		float r;
 
 		do_exec = FALSE;
 		do_cvar = string_null;
@@ -143,20 +144,17 @@ void GameCommand(string theCommand)
 			{
 				++i;
 				do_cvar = argv(i);
-				++i;
 				continue;
 			}
 			if(argv(i) == "--exec")
 			{
 				do_exec = TRUE;
-				++i;
 				continue;
 			}
 			if(argv(i) == "--key" && i+2 < argc)
 			{
 				++i;
 				key = stof(argv(i));
-				++i;
 				continue;
 			}
 			break;
@@ -174,11 +172,18 @@ void GameCommand(string theCommand)
 			bufstr_set(buf, ++j, sprintf("submit=%s", uri_escape(argv(i))));
 
 		if(j == 0) // no args: GET
-			crypto_uri_postbuf(url, URI_GET_CURL + curl_uri_get_pos, string_null, string_null, -1, key);
+			r = crypto_uri_postbuf(url, URI_GET_CURL + curl_uri_get_pos, string_null, string_null, -1, key);
 		else // with args: POST
-			crypto_uri_postbuf(url, URI_GET_CURL + curl_uri_get_pos, "application/x-www-form-urlencoded", "&", buf, key);
+			r = crypto_uri_postbuf(url, URI_GET_CURL + curl_uri_get_pos, "application/x-www-form-urlencoded", "&", buf, key);
 
-		curl_uri_get_pos = mod(curl_uri_get_pos + 1, URI_GET_CURL_END - URI_GET_CURL + 1);
+		if(r)
+		{
+			curl_uri_get_exec[curl_uri_get_pos] = do_exec;
+			curl_uri_get_cvar[curl_uri_get_pos] = do_cvar;
+			curl_uri_get_pos = mod(curl_uri_get_pos + 1, URI_GET_CURL_END - URI_GET_CURL + 1);
+		}
+		else
+			print("error creating curl handle\n");
 
 		buf_del(buf);
 
diff --git a/qcsrc/menu/xonotic/util.qc b/qcsrc/menu/xonotic/util.qc
index 800f34886..0bacab7a4 100644
--- a/qcsrc/menu/xonotic/util.qc
+++ b/qcsrc/menu/xonotic/util.qc
@@ -359,7 +359,8 @@ void preMenuDraw()
 		if(!_Nex_ExtResponseSystem_Queried)
 		{
 			_Nex_ExtResponseSystem_Queried = 1;
-			uri_get(sprintf("http://www.xonotic.org/dl/checkupdate.txt?version=%s", uri_escape(cvar_string("g_xonoticversion"))), URI_GET_UPDATENOTIFICATION);
+			//uri_get(sprintf("http://www.xonotic.org/dl/checkupdate.txt?version=%s", uri_escape(cvar_string("g_xonoticversion"))), URI_GET_UPDATENOTIFICATION);
+			crypto_uri_postbuf(sprintf("http://www.xonotic.org/dl/t/checkupdate2.cgi?version=%s", uri_escape(cvar_string("g_xonoticversion"))), URI_GET_UPDATENOTIFICATION, "application/x-www-urlencoded", "hello=world&foo=bar", -1, 0);
 		}
 	}