Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AP_Scripting: Don't restart scripts if it panic'd during the initial VM creation

This commit is contained in:
Michael du Breuil 2019-12-04 23:17:06 -07:00 committed by WickedShell
parent cff648caf6
commit 9fe2c02079
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libraries/AP_Scripting/lua_scripts.cpp
View File

@ -304,6 +304,8 @@ void *lua_scripts::alloc(void *ud, void *ptr, size_t osize, size_t nsize) {
}
void lua_scripts::run(void) {
bool succeeded_initial_load = false;
if (_heap == nullptr) {
gcs().send_text(MAV_SEVERITY_INFO, "Lua: Unable to allocate a heap");
return;
@ -311,6 +313,9 @@ void lua_scripts::run(void) {
// panic should be hooked first
if (setjmp(panic_jmp)) {
if (!succeeded_initial_load) {
return;
}
if (lua_state != nullptr) {
lua_close(lua_state); // shutdown the old state
}
@ -349,6 +354,8 @@ void lua_scripts::run(void) {
// Scan the filesystem in an appropriate manner and autostart scripts
load_all_scripts_in_dir(L, SCRIPTING_DIRECTORY);
succeeded_initial_load = true;
while (AP_Scripting::get_singleton()->enabled()) {
#if defined(AP_SCRIPTING_CHECKS) && AP_SCRIPTING_CHECKS >= 1
if (lua_gettop(L) != 0) {