Merge branch 'master' into terencehill/quickmenu

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / main.qc

diff --git a/qcsrc/client/main.qc b/qcsrc/client/main.qc
index 13f9545faab60a7c944d4d45b192dc6e16ca8a46..545786a2bc3d10bef19da391480f5323fbb3bf55 100644 (file)
--- a/qcsrc/client/main.qc
+++ b/qcsrc/client/main.qc
@@ -54,7 +54,7 @@ void WaypointSprite_Load();
 void ConsoleCommand_macro_init();
 void CSQC_Init(void)
 {
-       prvm_language = cvar_string("prvm_language");
+       prvm_language = strzone(cvar_string("prvm_language"));
 
 #ifdef WATERMARK
        dprintf("^4CSQC Build information: ^1%s\n", WATERMARK);
@@ -335,6 +335,9 @@ float CSQC_InputEvent(float bInputType, float nPrimary, float nSecondary)
        if (HUD_Panel_InputEvent(bInputType, nPrimary, nSecondary))
                return true;
 
+       if (HUD_QuickMenu_InputEvent(bInputType, nPrimary, nSecondary))
+               return true;
+
        if (MapVote_InputEvent(bInputType, nPrimary, nSecondary))
                return true;