Elvis has left the building

[xonotic/darkplaces.git] / cl_screen.c

diff --git a/cl_screen.c b/cl_screen.c
index 1d1280e990808143a612042a05a0dda7f20de5ba..fd5188eb3386ebcb2168abb21cdc43b100d8204d 100644 (file)
--- a/cl_screen.c
+++ b/cl_screen.c
@@ -738,7 +738,9 @@ SCR_DrawConsole
 void SCR_DrawConsole (void)
 {
        // infobar and loading progress are not drawn simultaneously
-       scr_con_margin_bottom = SCR_InfobarHeight() ?: scr_loading * scr_loadingscreen_barheight.integer;
+       scr_con_margin_bottom = SCR_InfobarHeight();
+       if (!scr_con_margin_bottom && scr_loading)
+               scr_con_margin_bottom = scr_loadingscreen_barheight.integer;
        if (key_consoleactive & KEY_CONSOLEACTIVE_FORCED)
        {
                // full screen