summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/gui/popupmenu.cpp3
-rw-r--r--src/gui/windowmenu.cpp1
2 files changed, 3 insertions, 1 deletions
diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp
index 520b4005..01870e62 100644
--- a/src/gui/popupmenu.cpp
+++ b/src/gui/popupmenu.cpp
@@ -128,7 +128,8 @@ void PopupMenu::showPopup(int x, int y, Being *being)
mBrowserBox->addRow(strprintf("@@follow|%s@@",
strprintf(_("Follow %s"),
name.c_str()).c_str()));
- mBrowserBox->addRow(strprintf("@@guild|%s@@",
+ if (player_node->getNumberOfGuilds())
+ mBrowserBox->addRow(strprintf("@@guild|%s@@",
strprintf(_("Invite %s to join your guild"),
name.c_str()).c_str()));
if (player_node->isInParty())
diff --git a/src/gui/windowmenu.cpp b/src/gui/windowmenu.cpp
index 5af5a202..4b18de89 100644
--- a/src/gui/windowmenu.cpp
+++ b/src/gui/windowmenu.cpp
@@ -72,6 +72,7 @@ WindowMenu::WindowMenu():
WindowMenu::~WindowMenu()
{
+ delete mEmotePopup;
}
void WindowMenu::action(const gcn::ActionEvent &event)