From 6f7ee35f241d85cc01c5d50208aedd1993060b0b Mon Sep 17 00:00:00 2001
From: "M. Liebmann" <tuxcode.bbg@gmail.com>
Date: Wed, 21 Sep 2016 08:17:14 +0200
Subject: [PATCH] CLuaInstMessagebox::MessageboxExec: Fix 'show_buttons'
 handling

---
 src/gui/lua/lua_messagebox.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/gui/lua/lua_messagebox.cpp b/src/gui/lua/lua_messagebox.cpp
index 3d5760525..303db0541 100644
--- a/src/gui/lua/lua_messagebox.cpp
+++ b/src/gui/lua/lua_messagebox.cpp
@@ -66,7 +66,7 @@ int CLuaInstMessagebox::MessageboxExec(lua_State *L)
 	tableLookup(L, "name", name) || tableLookup(L, "title", name) || tableLookup(L, "caption", name);
 	tableLookup(L, "text", text);
 	tableLookup(L, "icon", icon);
-	lua_Integer timeout = -1, width = 450, return_default_on_timeout = 0, show_buttons = CMessageBox::mbAll, default_button = CMessageBox::mbrYes;
+	lua_Integer timeout = -1, width = 450, return_default_on_timeout = 0, show_buttons = 0, default_button = 0;
 	tableLookup(L, "timeout", timeout);
 	tableLookup(L, "width", width);
 	tableLookup(L, "return_default_on_timeout", return_default_on_timeout);
@@ -80,13 +80,13 @@ int CLuaInstMessagebox::MessageboxExec(lua_State *L)
 			{ "right",	CMessageBox::mbBtnAlignRight },
 			{ NULL,		0 }
 		};
-		show_buttons = 0;
 		for (int i = 0; mb[i].name; i++)
 			if (!strcmp(mb[i].name, tmp.c_str())) {
 				show_buttons |= mb[i].code;
 				break;
 			}
 	}
+
 	lua_pushstring(L, "buttons");
 	lua_gettable(L, -2);
 	for (lua_pushnil(L); lua_next(L, -2); lua_pop(L, 2)) {
@@ -108,6 +108,8 @@ int CLuaInstMessagebox::MessageboxExec(lua_State *L)
 			}
 	}
 	lua_pop(L, 1);
+	if ((show_buttons & 0xFF) == 0)
+		show_buttons |= CMessageBox::mbAll;
 
 	table_key mbr[] = {
 		{ "yes",	CMessageBox::mbrYes },
@@ -118,7 +120,6 @@ int CLuaInstMessagebox::MessageboxExec(lua_State *L)
 		{ NULL,		0 }
 	};
 	if (tableLookup(L, "default", tmp)) {
-		default_button = 0;
 		for (int i = 0; mbr[i].name; i++)
 			if (!strcmp(mbr[i].name, tmp.c_str())) {
 				default_button = mbr[i].code;