summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Lantsev <aunsane@gmail.com>2015-06-11 14:21:40 +0000
committerAlexander Lantsev <aunsane@gmail.com>2015-06-11 14:21:40 +0000
commite498e2e961e0edf547cbc478797e69ec8a8d42d4 (patch)
tree3ab5b6a93ffc167deeb2ef8aea0eb4c89efbcbf0
parent8ecb995a281008dbbc83ba8ea04ef28dbdc3d2e2 (diff)
MirLua: fixed utf8 decoding
git-svn-id: http://svn.miranda-ng.org/main/trunk@14117 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
-rw-r--r--plugins/MirLua/src/m_genmenu.cpp2
-rw-r--r--plugins/MirLua/src/m_icolib.cpp4
2 files changed, 3 insertions, 3 deletions
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;