From e498e2e961e0edf547cbc478797e69ec8a8d42d4 Mon Sep 17 00:00:00 2001 From: Alexander Lantsev Date: Thu, 11 Jun 2015 14:21:40 +0000 Subject: MirLua: fixed utf8 decoding git-svn-id: http://svn.miranda-ng.org/main/trunk@14117 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/MirLua/src/m_genmenu.cpp | 2 +- plugins/MirLua/src/m_icolib.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'plugins') diff --git a/plugins/MirLua/src/m_genmenu.cpp b/plugins/MirLua/src/m_genmenu.cpp index 83001cd27b..3ded59d384 100644 --- a/plugins/MirLua/src/m_genmenu.cpp +++ b/plugins/MirLua/src/m_genmenu.cpp @@ -7,7 +7,7 @@ static CLISTMENUITEM* MakeMenuItem(lua_State *L) lua_pushstring(L, "Name"); lua_gettable(L, -2); - pmi->pszName = LPGEN((char*)luaL_checkstring(L, -1)); + pmi->pszName = mir_utf8decode((char*)luaL_checkstring(L, -1), NULL); lua_pop(L, 1); lua_pushstring(L, "Flags"); diff --git a/plugins/MirLua/src/m_icolib.cpp b/plugins/MirLua/src/m_icolib.cpp index a1e1a35d24..22da2cbc43 100644 --- a/plugins/MirLua/src/m_icolib.cpp +++ b/plugins/MirLua/src/m_icolib.cpp @@ -11,8 +11,8 @@ static int lua_AddIcon(lua_State *L) SKINICONDESC si = { 0 }; si.flags = SIDF_PATH_TCHAR; si.pszName = iconName; - si.description.a = (char*)lua_tostring(L, 2); - si.section.a = lua_isnone(L, 3) ? MODULE : (char*)lua_tostring(L, 3); + si.description.a = mir_utf8decode((char*)luaL_checkstring(L, 2), NULL); + si.section.a = lua_isnone(L, 3) ? MODULE : mir_utf8decode((char*)luaL_checkstring(L, 3), NULL); si.defaultFile.t = filePath; si.iDefaultIndex = -IDI_ICON; -- cgit v1.2.3