Dedicated Server|Fixed: Main loop was not running

The loop callback was incorrectly exited immediately in novideo mode.
skyjake · Apr 10, 2012 · 71f4caa · 71f4caa
1 parent f05a2b5
commit 71f4caa
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/doomsday/engine/portable/src/dd_loop.c b/doomsday/engine/portable/src/dd_loop.c
@@ -116,8 +116,6 @@ int DD_GameLoop(void)
 
 void DD_GameLoopCallback(void)
 {
-    if(novideo) return; // Only after the frame has been drawn, please.
-
     if(Sys_IsShuttingDown())
         return; // Shouldn't run this while shutting down.
 
@@ -132,11 +130,11 @@ void DD_GameLoopCallback(void)
     // Update clients at regular intervals.
     Sv_TransmitFrame();
 
-    // Request update of window contents.
-    Window_Draw(Window_Main());
-
     if(!novideo)
     {
+        // Request update of window contents.
+        Window_Draw(Window_Main());
+
         GL_ProcessDeferredTasks(FRAME_DEFERRED_UPLOAD_TIMEOUT);
     }
 

diff --git a/doomsday/libdeng2/src/legacy/legacycore.cpp b/doomsday/libdeng2/src/legacy/legacycore.cpp
@@ -127,6 +127,12 @@ void LegacyCore::popLoop()
     d->loopStack.removeLast();
 
     LOG_DEBUG("Loop function popped, now %p.") << dintptr(d->loop.func);
+
+    if(d->loop.func)
+    {
+        // Start the periodic callback calls.
+        QTimer::singleShot(d->loop.interval, this, SLOT(callback()));
+    }
 }
 
 int LegacyCore::runEventLoop()