浏览代码

stop crash from null objects at exit, part duex

JimMarlowe 9 年之前
父节点
当前提交
967d4eccd2
共有 1 个文件被更改,包括 4 次插入4 次删除
  1. 4 4
      Source/Atomic/Engine/Engine.cpp

+ 4 - 4
Source/Atomic/Engine/Engine.cpp

@@ -494,6 +494,10 @@ void Engine::RunFrame()
     time->BeginFrame(timeStep_);
 
 // ATOMIC BEGIN
+
+    if ( exiting_ ) // exit check for script event handlers
+        return;
+
     // If paused, or pause when minimized -mode is in use, stop updates and audio as necessary
     if ((paused_ && !runNextPausedFrame_) ||
         (pauseMinimized_ && input->IsMinimized()))
@@ -711,8 +715,6 @@ void Engine::DumpMemory()
 
 void Engine::Update()
 {
-    if (exiting_)
-        return;
     
     ATOMIC_PROFILE(Update);
 
@@ -735,8 +737,6 @@ void Engine::Update()
 
 void Engine::Render()
 {
-    if ( exiting_ )
-        return;
 
     if (headless_)
         return;