Set error message if script fails in create() function
This commit is contained in:
@@ -228,6 +228,8 @@ struct eventData {
|
|||||||
|
|
||||||
class LuaWidget: public Widget
|
class LuaWidget: public Widget
|
||||||
{
|
{
|
||||||
|
friend class LuaWidgetFactory;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
LuaWidget(const WidgetFactory * factory, FormGroup * parent, const rect_t & rect, WidgetPersistentData * persistentData, int luaWidgetDataRef):
|
LuaWidget(const WidgetFactory * factory, FormGroup * parent, const rect_t & rect, WidgetPersistentData * persistentData, int luaWidgetDataRef):
|
||||||
Widget(factory, parent, rect, persistentData),
|
Widget(factory, parent, rect, persistentData),
|
||||||
@@ -353,11 +355,12 @@ class LuaWidgetFactory: public WidgetFactory
|
|||||||
l_pushtableint(option->name, value);
|
l_pushtableint(option->name, value);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (lua_pcall(lsWidgets, 2, 1, 0) != 0) {
|
bool err = lua_pcall(lsWidgets, 2, 1, 0);
|
||||||
TRACE("Error in widget %s create() function: %s", getName(), lua_tostring(lsWidgets, -1));
|
int widgetData = err ? LUA_NOREF : luaL_ref(lsWidgets, LUA_REGISTRYINDEX);
|
||||||
}
|
LuaWidget* lw = new LuaWidget(this, parent, rect, persistentData, widgetData);
|
||||||
int widgetData = luaL_ref(lsWidgets, LUA_REGISTRYINDEX);
|
if (err)
|
||||||
return new LuaWidget(this, parent, rect, persistentData, widgetData);
|
lw->setErrorMessage("create()");
|
||||||
|
return lw;
|
||||||
}
|
}
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
|
|||||||
Reference in New Issue
Block a user