From 466e09152f9fd24dfb24fcdf6b95731ae9e0f4ed Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Wed, 4 Sep 2013 04:07:51 +0000
Subject: Don't show ENDOOM screen when aborting netgame startup (thanks
 Alexandre Xavier).

Subversion-branch: /branches/v2-branch
Subversion-revision: 2635
---
 src/heretic/d_main.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/heretic')

diff --git a/src/heretic/d_main.c b/src/heretic/d_main.c
index 8ca49ba6..6dc29cf7 100644
--- a/src/heretic/d_main.c
+++ b/src/heretic/d_main.c
@@ -79,6 +79,7 @@ int startmap;
 int UpdateState;
 static int graphical_startup = 1;
 static boolean using_graphical_startup;
+static boolean main_loop_started = false;
 boolean autostart;
 extern boolean automapactive;
 
@@ -254,6 +255,8 @@ void D_DoomLoop(void)
     I_InitGraphics();
     I_SetGrabMouseCallback(D_GrabMouseCallback);
 
+    main_loop_started = true;
+
     while (1)
     {
         // Frame syncronous IO operations
@@ -782,7 +785,7 @@ static void D_Endoom(void)
 
     // Disable ENDOOM?
 
-    if (!show_endoom || testcontrols)
+    if (!show_endoom || testcontrols || !main_loop_started)
     {
         return;
     }
-- 
cgit v1.2.3