also enter the event loop during Q3 map load... should prevent Vista's not responding...

[xonotic/darkplaces.git] / cl_screen.c

diff --git a/cl_screen.c b/cl_screen.c
index 0a9f4664babdcbc2b072bf90a054e092c66006ca..1c963db773337f3b2b155db31f6c2d54e3388928 100644 (file)
--- a/cl_screen.c
+++ b/cl_screen.c
@@ -1623,6 +1623,12 @@ static double loadingscreentime = -1;
 static qboolean loadingscreencleared = false;
 static float loadingscreenheight = 0;
 
+void SCR_UpdateLoadingScreenIfShown()
+{
+       if(realtime == loadingscreentime)
+               SCR_UpdateLoadingScreen(loadingscreencleared);
+}
+
 void SCR_PushLoadingScreen (qboolean redraw, const char *msg, float len_in_parent)
 {
        loadingscreenstack_t *s = (loadingscreenstack_t *) Z_Malloc(sizeof(loadingscreenstack_t));
@@ -1645,8 +1651,8 @@ void SCR_PushLoadingScreen (qboolean redraw, const char *msg, float len_in_paren
                s->absolute_loading_amount_len = 1;
        }
 
-       if(redraw && realtime == loadingscreentime)
-               SCR_UpdateLoadingScreen(loadingscreencleared);
+       if(redraw)
+               SCR_UpdateLoadingScreenIfShown();
 }
 
 void SCR_PopLoadingScreen (qboolean redraw)
@@ -1657,8 +1663,8 @@ void SCR_PopLoadingScreen (qboolean redraw)
                s->prev->relative_completion = (s->absolute_loading_amount_min + s->absolute_loading_amount_len - s->prev->absolute_loading_amount_min) / s->prev->absolute_loading_amount_len;
        Z_Free(s);
 
-       if(redraw && realtime == loadingscreentime)
-               SCR_UpdateLoadingScreen(loadingscreencleared);
+       if(redraw)
+               SCR_UpdateLoadingScreenIfShown();
 }
 
 static float SCR_DrawLoadingStack_r(loadingscreenstack_t *s, float y)