chibicitiberiu/rainmeter-studio
1
0
Fork 0
mirror of https://github.com/chibicitiberiu/rainmeter-studio.git synced 2024-02-24 04:33:31 +00:00
Code Issues Releases Wiki Activity

- Script: Return types are now checked explicitly. As a result, 'return 5' and 'return "5"' are not equal any longer. Only the former will respect NumOfDecimals, Scale, etc. now.

Browse Source 
- NowPlayingPlugin: Accidentally removed "Previous" bang in r880, fixed.
This commit is contained in:
Birunthan Mohanathas
2011-08-01 17:08:51 +00:00
parent cb4aa0ade3
commit 5eef7a21c7
4 changed files with 17 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Library/lua/LuaScript.cpp
View File

@ -147,12 +147,11 @@ void LuaScript::RunFunction(const char* funcName)
** RunFunctionWithReturn
**
** Runs given function in script file and stores the retruned number or string.
** Returns LUA_TNIL when no return.
**
*/
int LuaScript::RunFunctionWithReturn(const char* funcName, double& numValue, std::wstring& strValue)
{
int ret = LUA_TNIL;
int type = LUA_TNIL;
if (m_Initialized)
{
@ -169,23 +168,23 @@ int LuaScript::RunFunctionWithReturn(const char* funcName, double& numValue, std
}
else
{
if (lua_isnumber(m_State, -1))
type = lua_type(m_State, -1);
if (type == LUA_TNUMBER)
{
numValue = lua_tonumber(m_State, -1);
ret = LUA_TNUMBER;
}
else if (lua_isstring(m_State, -1))
else if (type == LUA_TSTRING)
{
const char* str = lua_tostring(m_State, -1);
strValue = ConvertToWide(str);
ret = LUA_TSTRING;
numValue = 0;
}
lua_pop(m_State, 2);
}
}
return ret;
return type;
}
/*