From a95f736cbea6f1efec41357532baa887fa4cd6aa Mon Sep 17 00:00:00 2001
From: krzys-h <krzys_h@interia.pl>
Date: Sat, 3 Jun 2017 20:05:54 +0200
Subject: [PATCH] Fix delete(this.id), closes #925

---
 src/script/scriptfunc.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/script/scriptfunc.cpp b/src/script/scriptfunc.cpp
index 092ceca1..8a774907 100644
--- a/src/script/scriptfunc.cpp
+++ b/src/script/scriptfunc.cpp
@@ -695,7 +695,11 @@ bool CScriptFunctions::rDelete(CBotVar* var, CBotVar* result, int& exception, vo
             CObjectManager::GetInstancePointer()->DeleteObject(obj);
         }
     }
-    return true;
+
+    // Returning "false" here makes sure the program doesn't try to keep executing if the robot just destroyed itself
+    // using delete(this.id)
+    // See issue #925
+    return false;
 }
 
 CBotTypResult compileSearch(CBotVar* &var, void* user, CBotTypResult returnValue)