From da050a5630709c509174624a50d8b284526f67d6 Mon Sep 17 00:00:00 2001 From: Eduardo Bart Date: Wed, 30 Jan 2013 18:57:37 -0200 Subject: [PATCH] Fix trade/use bug from previous commit --- modules/corelib/ui/uipopupmenu.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/corelib/ui/uipopupmenu.lua b/modules/corelib/ui/uipopupmenu.lua index c9dd886f..c155dd82 100644 --- a/modules/corelib/ui/uipopupmenu.lua +++ b/modules/corelib/ui/uipopupmenu.lua @@ -58,8 +58,8 @@ function UIPopupMenu:addOption(optionName, optionCallback, shortcut) local optionWidget = g_ui.createWidget(self:getStyleName() .. 'Button', self) local lastOptionWidget = self:getLastChild() optionWidget.onClick = function(self) - optionCallback() self:getParent():destroy() + optionCallback() end optionWidget:setText(optionName) local width = optionWidget:getTextSize().width + optionWidget:getMarginLeft() + optionWidget:getMarginRight() + 15 @@ -81,6 +81,7 @@ function UIPopupMenu:onDestroy() if currentMenu == self then currentMenu = nil end + self:ungrabMouse() end function UIPopupMenu:onMousePress(mousePos, mouseButton)