piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

fix(color): standalone Lua syntax errors or missing run() may cause EM (#5212)

Browse Source
This commit is contained in:
philmoz
2024-06-23 18:46:36 +10:00
committed by GitHub
parent 0d9215a418
commit 0d6d35ef02
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/lua/interface.cpp
+11 -4
View File
@@ -729,7 +729,9 @@ void displayLuaError(bool firstCall = false)
}
#if defined(COLORLCD)
StandaloneLuaWindow::instance()->showError(firstCall, title, lua_warning_info);
if (StandaloneLuaWindow::instance()) {
StandaloneLuaWindow::instance()->showError(firstCall, title, lua_warning_info);
}
#else
if (!luaLcdAllowed)
return;
@@ -891,6 +893,9 @@ static void luaLoadScripts(bool init, const char * filename = nullptr)
ScriptInternalData & sid = scriptInternalData[luaScriptsCount++];
sid.reference = SCRIPT_STANDALONE;
if (luaLoad(filename, sid)) {
#if defined(COLORLCD)
StandaloneLuaWindow::setup(true);
#endif
luaError(lsScripts, sid.state);
continue;
}
@@ -933,6 +938,7 @@ static void luaLoadScripts(bool init, const char * filename = nullptr)
lua_getfield(lsScripts, -1, "useLvgl");
sid.useLvgl = lua_toboolean(lsScripts, -1);
lua_pop(lsScripts, 1);
StandaloneLuaWindow::setup(sid.useLvgl);
}
#endif
if (sid.run == LUA_NOREF) {
@@ -956,6 +962,10 @@ static void luaLoadScripts(bool init, const char * filename = nullptr)
else {
snprintf(lua_warning_info, LUA_WARNING_INFO_LEN, "luaLoadScripts(%.*s): The script did not return a table\n", LEN_SCRIPT_FILENAME, getScriptName(idx));
sid.state = SCRIPT_SYNTAX_ERROR;
#if defined(COLORLCD)
if (sid.reference == SCRIPT_STANDALONE)
StandaloneLuaWindow::setup(true);
#endif
initFunction = LUA_NOREF;
}
@@ -967,9 +977,6 @@ static void luaLoadScripts(bool init, const char * filename = nullptr)
lua_rawgeti(lsScripts, LUA_REGISTRYINDEX, initFunction);
if (ref == SCRIPT_STANDALONE) {
luaLcdAllowed = true;
#if defined(COLORLCD)
StandaloneLuaWindow::setup(sid.useLvgl);
#endif
}
}
}