[colobot] 20/100: Fix destructors not being called when program execution ended, closes #859

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository colobot.

commit 7190c8518e1814685bce91f336d2bda5f1b6514a
Author: krzys-h <krzys_h at interia.pl>
Date:   Fri Nov 11 23:07:22 2016 +0100

    Fix destructors not being called when program execution ended, closes #859
---
 src/CBot/CBotProgram.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/CBot/CBotProgram.cpp b/src/CBot/CBotProgram.cpp
index a303df6..65d373a 100644
--- a/src/CBot/CBotProgram.cpp
+++ b/src/CBot/CBotProgram.cpp
@@ -200,16 +200,16 @@ bool CBotProgram::Run(void* pUser, int timer)
     }
 
     // completed on a mistake?
-    if (!ok && !m_stack->IsOk())
+    if (ok || !m_stack->IsOk())
     {
         m_error = m_stack->GetError(m_errorStart, m_errorEnd);
         m_stack->Delete();
         m_stack = nullptr;
         CBotClass::FreeLock(this);
+        m_entryPoint = nullptr;
         return true;                                // execution is finished!
     }
 
-    if ( ok ) m_entryPoint = nullptr;                        // more function in execution
     return ok;
 }
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.git