Replaced emote window with a new emote popup

The popup is meant to be temporary, showing the emote instantly when you
click on it. It adapts nicely to show any number of emotes.

I still need to add a better way of assigning emote shortcuts, since
currently you can only change which emote is assigned to which shortcut
by actually using it.

1 files changed, 1 insertions, 5 deletions

diff --git a/src/gui/emotecontainer.cpp b/src/gui/emotecontainer.cpp
index 3003b949..0eee5434 100644
--- a/src/gui/emotecontainer.cpp
+++ b/src/gui/emotecontainer.cpp
@@ -70,11 +70,7 @@ EmoteContainer::EmoteContainer():
 
 EmoteContainer::~EmoteContainer()
 {
-    if (mSelImg)
-    {
-       mSelImg->decRef();
-       mSelImg = NULL;
-    }
+    mSelImg->decRef();
 }
 
 void EmoteContainer::draw(gcn::Graphics *graphics)