From: FruitieX <rasse@rasse-lappy.localdomain>
Date: Wed, 9 Jun 2010 23:41:33 +0000 (+0300)
Subject: Merge remote branch 'origin/diabolik/newpanelhud' into fruitiex/newpanelhud
X-Git-Tag: xonotic-v0.1.0preview~541^2~73
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4d2d3ac14bf8c8eddef75f94ebaf145683314c82;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/diabolik/newpanelhud' into fruitiex/newpanelhud
---

4d2d3ac14bf8c8eddef75f94ebaf145683314c82
diff --cc qcsrc/client/hud.qc
index 0b0bae802,1cbed1294..7d87df8f7
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@@ -1192,11 -1179,10 +1192,13 @@@ float HUD_Panel_InputEvent(float bInput
  		}
  	}
  	else if(nPrimary == K_ESCAPE)
- 		cvar_set("_hud_configure", "0");
+ 	{
+ 		localcmd("menu_showhudexit\n");
+ 	}
  
 +	else if(hit_con_bind)
 +		return false;
 +
  	return true; // Suppress ALL other input
  }