From: cloudwalk <cloudwalk@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Sat, 30 May 2020 19:59:11 +0000 (+0000)
Subject: Start video _during_ initialization, rather than when finding a model
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d57f0d758634d9cf5eadc8e31f3a3d0ced901e81;p=xonotic%2Fdarkplaces.git

Start video _during_ initialization, rather than when finding a model

Fixes Steel Storm: Burning Retribution crashing on start due to a NULL
array that isn't initialized before MQC draws their intro video.

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@12610 d7cf8633-e32d-0410-b094-e92efae38249
---

diff --git a/host.c b/host.c
index 46453fd1..313745a9 100644
--- a/host.c
+++ b/host.c
@@ -1336,6 +1336,9 @@ static void Host_Init (void)
 
 	Log_Start();
 	
+	// Starting after we parse commands so the screen resolution doesn't get weird for the first few seconds
+	Host_StartVideo();
+	
 	// put up the loading image so the user doesn't stare at a black screen...
 	SCR_BeginLoadingPlaque(true);
 
diff --git a/model_shared.c b/model_shared.c
index 19bbbc0a..d1a48dae 100644
--- a/model_shared.c
+++ b/model_shared.c
@@ -579,9 +579,6 @@ dp_model_t *Mod_FindName(const char *name, const char *parentname)
 	if (!parentname)
 		parentname = "";
 
-	// if we're not dedicatd, the renderer calls will crash without video
-	Host_StartVideo();
-
 	nummodels = (int)Mem_ExpandableArray_IndexRange(&models);
 
 	if (!name[0])