From 2f8effb6d146786aa4daffdee042cc5fb30d922f Mon Sep 17 00:00:00 2001 From: 3djc Date: Wed, 6 Jul 2016 18:41:45 +0200 Subject: [PATCH] Add function name to debug output (#3647) * Add function name to debug output * Better english, hopefully :) * Possible fix for not trying to run background widgets function when it does not exist * Typos --- radio/src/lua/interface.cpp | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/radio/src/lua/interface.cpp b/radio/src/lua/interface.cpp index 79e2e3342..02c58e789 100644 --- a/radio/src/lua/interface.cpp +++ b/radio/src/lua/interface.cpp @@ -981,7 +981,7 @@ class LuaWidgetFactory: public WidgetFactory } if (lua_pcall(L, 2, 1, 0) != 0) { - TRACE("Error in widget %s: %s", getName(), lua_tostring(L, -1)); + TRACE("Error in widget %s create() function: %s", getName(), lua_tostring(L, -1)); } int widgetData = luaL_ref(L, LUA_REGISTRYINDEX); Widget * widget = new LuaWidget(this, zone, persistentData, widgetData); @@ -1009,7 +1009,7 @@ void LuaWidget::update() const } if (lua_pcall(L, 2, 0, 0) != 0) { - TRACE("Error in widget %s: %s", factory->getName(), lua_tostring(L, -1)); + TRACE("Error in widget %s update() function: %s", factory->getName(), lua_tostring(L, -1)); } } @@ -1020,7 +1020,7 @@ void LuaWidget::refresh() lua_rawgeti(L, LUA_REGISTRYINDEX, factory->refreshFunction); lua_rawgeti(L, LUA_REGISTRYINDEX, widgetData); if (lua_pcall(L, 1, 0, 0) != 0) { - TRACE("Error in widget %s: %s", factory->getName(), lua_tostring(L, -1)); + TRACE("Error in widget %s refresh() function: %s", factory->getName(), lua_tostring(L, -1)); } } @@ -1028,10 +1028,12 @@ void LuaWidget::background() { SET_LUA_INSTRUCTIONS_COUNT(PERMANENT_SCRIPTS_MAX_INSTRUCTIONS); LuaWidgetFactory * factory = (LuaWidgetFactory *)this->factory; - lua_rawgeti(L, LUA_REGISTRYINDEX, factory->backgroundFunction); - lua_rawgeti(L, LUA_REGISTRYINDEX, widgetData); - if (lua_pcall(L, 1, 0, 0) != 0) { - TRACE("Error in widget %s: %s", factory->getName(), lua_tostring(L, -1)); + if (factory->backgroundFunction) { + lua_rawgeti(L, LUA_REGISTRYINDEX, factory->backgroundFunction); + lua_rawgeti(L, LUA_REGISTRYINDEX, widgetData); + if (lua_pcall(L, 1, 0, 0) != 0) { + TRACE("Error in widget %s background() function: %s", factory->getName(), lua_tostring(L, -1)); + } } }