From 6611e7bd2a2664c8dd5d64c8d138955db472b552 Mon Sep 17 00:00:00 2001 From: Mario Date: Thu, 24 Sep 2015 09:19:47 +1000 Subject: [PATCH] Don't use timeout if it's not set (fixes quickmenu not opening) --- qcsrc/client/quickmenu.qc | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/qcsrc/client/quickmenu.qc b/qcsrc/client/quickmenu.qc index 01667366e..44af6843b 100644 --- a/qcsrc/client/quickmenu.qc +++ b/qcsrc/client/quickmenu.qc @@ -173,7 +173,7 @@ bool QuickMenu_Open(string mode, string submenu) setcursormode(1); hudShiftState = 0; - QuickMenu_TimeOut = time + autocvar_hud_panel_quickmenu_time; + QuickMenu_TimeOut = ((autocvar_hud_panel_quickmenu_time > 0) ? time + autocvar_hud_panel_quickmenu_time : 0); return true; } @@ -357,7 +357,7 @@ bool QuickMenu_Page_Load(string target_submenu, int new_page) QuickMenu_Close(); return false; } - QuickMenu_TimeOut = time + autocvar_hud_panel_quickmenu_time; + QuickMenu_TimeOut = ((autocvar_hud_panel_quickmenu_time > 0) ? time + autocvar_hud_panel_quickmenu_time : 0); return true; } @@ -380,7 +380,7 @@ bool QuickMenu_ActionForNumber(int num) if (QuickMenu_Page_Command[num] != "") { localcmd(strcat("\n", QuickMenu_Page_Command[num], "\n")); - QuickMenu_TimeOut = time + autocvar_hud_panel_quickmenu_time; + QuickMenu_TimeOut = ((autocvar_hud_panel_quickmenu_time > 0) ? time + autocvar_hud_panel_quickmenu_time : 0); return true; } if (QuickMenu_Page_Description[num] != "") @@ -586,6 +586,7 @@ void HUD_QuickMenu(void) //if(!autocvar_hud_panel_quickmenu) return; if(!hud_panel_quickmenu) return; + if(QuickMenu_TimeOut) if(time > QuickMenu_TimeOut) { QuickMenu_Close(); -- 2.39.2