3 files changed, 11 insertions, 5 deletions
diff --git a/plugins/MirLua/src/m_database.cpp b/plugins/MirLua/src/m_database.cpp
index 91f7361e88..5aedf56b8f 100644
--- a/plugins/MirLua/src/m_database.cpp
+++ b/plugins/MirLua/src/m_database.cpp
@@ -59,7 +59,7 @@ static int lua_GetContactSetting(lua_State *L)
 	DBVARIANT dbv;
 	if (db_get(hContact, szModule, szSetting, &dbv))
 	{
-		lua_pushnil(L);
+		lua_pushvalue(L, 4);
 		return 1;
 	}
 
@@ -85,7 +85,7 @@ static int lua_GetContactSetting(lua_State *L)
 
 	default:
 		db_free(&dbv);
-		lua_pushnil(L);
+		lua_pushvalue(L, 4);
 		return 1;
 	}
 
diff --git a/plugins/MirLua/src/m_genmenu.cpp b/plugins/MirLua/src/m_genmenu.cpp
index cda7655a77..2e4445d71d 100644
--- a/plugins/MirLua/src/m_genmenu.cpp
+++ b/plugins/MirLua/src/m_genmenu.cpp
@@ -7,7 +7,10 @@ static CLISTMENUITEM* MakeMenuItem(lua_State *L)
 
 	lua_pushstring(L, "Name");
 	lua_gettable(L, -2);
-	pmi->pszName = mir_utf8decode((char*)luaL_checkstring(L, -1), NULL);
+	if (!(pmi->flags & CMIF_UNICODE))
+		pmi->pszName = mir_utf8decode((char*)lua_tostring(L, -1), NULL);
+	else
+		pmi->ptszName = mir_utf8decodeT((char*)luaL_checkstring(L, -1));
 	lua_pop(L, 1);
 
 	lua_pushstring(L, "Flags");
diff --git a/plugins/MirLua/src/m_msg_buttonsbar.cpp b/plugins/MirLua/src/m_msg_buttonsbar.cpp
index bdaabf2a94..a9b1f6756f 100644
--- a/plugins/MirLua/src/m_msg_buttonsbar.cpp
+++ b/plugins/MirLua/src/m_msg_buttonsbar.cpp
@@ -18,12 +18,15 @@ static BBButton* MakeBBButton(lua_State *L)
 
 	lua_pushstring(L, "Flags");
 	lua_gettable(L, -2);
-	tbb->bbbFlags = BBBF_ISLSIDEBUTTON | lua_tointeger(L, -1);
+	tbb->bbbFlags = lua_tointeger(L, -1);
 	lua_pop(L, 1);
 
 	lua_pushstring(L, "Tooltip");
 	lua_gettable(L, -2);
-	tbb->ptszTooltip = mir_utf8decodeT((char*)lua_tostring(L, -1));
+	if ((tbb->bbbFlags & BBBF_ANSITOOLTIP))
+		tbb->pszTooltip = mir_utf8decode((char*)lua_tostring(L, -1), NULL);
+	else
+		tbb->ptszTooltip = mir_utf8decodeT((char*)lua_tostring(L, -1));
 	lua_pop(L, 1);
 
 	lua_pushstring(L, "Icon");