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

Set error message if script fails in create() function

Browse Source
This commit is contained in:
jfrickmann
2021-09-11 13:36:10 -04:00
parent 98ed28db09
commit dcd5db38f9
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/lua/widgets.cpp
+8 -5
View File
@@ -228,6 +228,8 @@ struct eventData {
class LuaWidget: public Widget
{
friend class LuaWidgetFactory;
public:
LuaWidget(const WidgetFactory * factory, FormGroup * parent, const rect_t & rect, WidgetPersistentData * persistentData, int luaWidgetDataRef):
Widget(factory, parent, rect, persistentData),
@@ -353,11 +355,12 @@ class LuaWidgetFactory: public WidgetFactory
l_pushtableint(option->name, value);
}
if (lua_pcall(lsWidgets, 2, 1, 0) != 0) {
TRACE("Error in widget %s create() function: %s", getName(), lua_tostring(lsWidgets, -1));
}
int widgetData = luaL_ref(lsWidgets, LUA_REGISTRYINDEX);
return new LuaWidget(this, parent, rect, persistentData, widgetData);
bool err = lua_pcall(lsWidgets, 2, 1, 0);
int widgetData = err ? LUA_NOREF : luaL_ref(lsWidgets, LUA_REGISTRYINDEX);
LuaWidget* lw = new LuaWidget(this, parent, rect, persistentData, widgetData);
if (err)
lw->setErrorMessage("create()");
return lw;
}
protected: