mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-31 17:31:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

CLuaInstance: simplified error message handler

Browse Source 
use DisplayErrorMessage() instead full call of ShowMsg.

Signed-off-by: M. Liebmann <tuxcode.bbg@gmail.com>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7a1fed715f
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-09-17 (Thu, 17 Sep 2015)

Origin message was:
------------------
CLuaInstance: simplified error message handler

use DisplayErrorMessage() instead full call of ShowMsg.

Signed-off-by: M. Liebmann <tuxcode.bbg@gmail.com>


------------------
This commit was generated by Migit
This commit is contained in:
Thilo Graf
2015-09-17 12:01:13 +02:00
committed by Michael Liebmann
parent c0d803c7ad
commit ea0802aa1f
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui/luainstance.cpp
View File

@@ -435,7 +435,7 @@ void CLuaInstance::runScript(const char *fileName, std::vector<std::string> *arg
int status = luaL_loadfile(lua, fileName); int status = luaL_loadfile(lua, fileName);
if (status) { if (status) {
fprintf(stderr, "[CLuaInstance::%s] Can't load file: %s\n", __func__, lua_tostring(lua, -1)); fprintf(stderr, "[CLuaInstance::%s] Can't load file: %s\n", __func__, lua_tostring(lua, -1));
ShowMsg2UTF("Lua script error:", lua_tostring(lua, -1), CMsgBox::mbrBack, CMsgBox::mbBack); DisplayErrorMessage(lua_tostring(lua, -1), "Lua Script Error:");
if (error_string) if (error_string)
*error_string = std::string(lua_tostring(lua, -1)); *error_string = std::string(lua_tostring(lua, -1));
return; return;
@@ -466,7 +466,7 @@ void CLuaInstance::runScript(const char *fileName, std::vector<std::string> *arg
if (status) if (status)
{ {
fprintf(stderr, "[CLuaInstance::%s] error in script: %s\n", __func__, lua_tostring(lua, -1)); fprintf(stderr, "[CLuaInstance::%s] error in script: %s\n", __func__, lua_tostring(lua, -1));
ShowMsg2UTF("Lua script error:", lua_tostring(lua, -1), CMsgBox::mbrBack, CMsgBox::mbBack); DisplayErrorMessage(lua_tostring(lua, -1), "Lua Script Error:");
if (error_string) if (error_string)
*error_string = std::string(lua_tostring(lua, -1)); *error_string = std::string(lua_tostring(lua, -1));
} }
@@ -2686,7 +2686,7 @@ int CLuaInstance::checkVersion(lua_State *L)
LUA_API_VERSION_MAJOR, LUA_API_VERSION_MINOR, LUA_API_VERSION_MAJOR, LUA_API_VERSION_MINOR,
g_Locale->getText(LOCALE_LUA_VERSIONSCHECK2), g_Locale->getText(LOCALE_LUA_VERSIONSCHECK2),
major, minor); major, minor);
ShowMsg(LOCALE_MESSAGEBOX_ERROR, msg, CMessageBox::mbrBack, CMessageBox::mbBack, NEUTRINO_ICON_ERROR); DisplayErrorMessage(msg, "Lua Script Error:");
} }
lua_pushinteger(L, ret); lua_pushinteger(L, ret);
return 1; return 1;