Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(bw): prevent phantom 'Script error' message after trying to load a Lua 5.2 luac file #5819

Merged
merged 2 commits into from
Jan 22, 2025
Merged

fix(bw): prevent phantom 'Script error' message after trying to load a Lua 5.2 luac file #5819

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
895670a
Prevent phantom 'Script error' message after trying to load a Lua 5.2…
Jan 22, 2025
d722cb2
Remove diagnostic change.
Jan 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions radio/src/lua/interface.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -561,10 +561,12 @@ int luaLoadScriptFileToState(lua_State * L, const char * filename, const char *
TRACE("luaLoadScriptFileToState(%s, %s): loading %s", filename, lmode, filenameFull);

// we don't pass <mode> on to loadfilex() because we want lua to load whatever file we specify, regardless of content
int t = lua_gettop(L);
lstatus = luaL_loadfilex(L, filenameFull, nullptr);
#if defined(LUA_COMPILER)
// Check for bytecode encoding problem, eg. compiled for x64. Unfortunately Lua doesn't provide a unique error code for this. See Lua/src/lundump.c.
if (lstatus == LUA_ERRSYNTAX && loadFileType == 2 && frLuaS == FR_OK && strstr(lua_tostring(L, -1), "precompiled")) {
lua_settop(L, t); // reset stack to prevent phantom error
loadFileType = 1;
scriptNeedsCompile = true;
strcpy(filenameFull + fnamelen, SCRIPT_EXT);
Expand Down
Loading