From: black <black@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Thu, 2 Jun 2005 19:21:26 +0000 (+0000)
Subject: Didnt know that Host_StartVideo works this way (called randomly around the code)... 
X-Git-Tag: xonotic-v0.1.0preview~4801
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=commitdiff_plain;h=c49d3bf46e9015474feea7c291b7f52c9095ae7c

Didnt know that Host_StartVideo works this way (called randomly around the code), so now the menu should be loaded at the right time (or just-in-time :))


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

diff --git a/host.c b/host.c
index abbbff18..385a1c2b 100644
--- a/host.c
+++ b/host.c
@@ -1027,6 +1027,20 @@ void Host_Init (void)
 	// save console log up to this point to log_file if it was set by configs
 	Log_Start();
 
+	// FIXME: put this into some neat design, but the menu should be allowed to crash
+	// without crashing the whole game, so this should just be a short-time solution
+	Host_StartVideo();
+
+	// here comes the not so critical stuff
+	if (setjmp(host_abortframe)) {
+		return;
+	}
+
+	if (cls.state != ca_dedicated)
+	{
+		MR_Init();
+	}
+
 	// check for special benchmark mode
 // COMMANDLINEOPTION: Client: -benchmark <demoname> runs a timedemo and quits, results of any timedemo can be found in gamedir/benchmark.log (for example id1/benchmark.log)
 	i = COM_CheckParm("-benchmark");
@@ -1056,19 +1070,6 @@ void Host_Init (void)
 	Con_DPrint("========Initialized=========\n");
 
 	Host_StartVideo();
-
-	// FIXME: put this into some neat design, but the menu should be allowed to crash
-	// without crashing the whole game, so this should just be a short-time solution
-
-	// here comes the not so critical stuff
-	if (setjmp(host_abortframe)) {
-		return;
-	}
-
-	if (vid_opened && cls.state != ca_dedicated)
-	{
-		MR_Init();
-	}
 }