From 46cd4e737a5a74f823877c1fd00a6af84005612f Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Fri, 7 May 2010 03:58:26 +0300
Subject: Fix reading arrays at index -1.

Signed-off-by: Jared Adams <jaxad0127@gmail.com>
---
 src/gui/widgets/emoteshortcutcontainer.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/gui/widgets/emoteshortcutcontainer.cpp')

diff --git a/src/gui/widgets/emoteshortcutcontainer.cpp b/src/gui/widgets/emoteshortcutcontainer.cpp
index 2b07ad1e..82fb9f8d 100644
--- a/src/gui/widgets/emoteshortcutcontainer.cpp
+++ b/src/gui/widgets/emoteshortcutcontainer.cpp
@@ -124,11 +124,12 @@ void EmoteShortcutContainer::mouseDragged(gcn::MouseEvent &event)
         if (!mEmoteMoved && mEmoteClicked)
         {
             const int index = getIndexFromGrid(event.getX(), event.getY());
-            const int emoteId = emoteShortcut->getEmote(index);
 
             if (index == -1)
                 return;
 
+            const int emoteId = emoteShortcut->getEmote(index);
+
             if (emoteId)
             {
                 mEmoteMoved = emoteId;
-- 
cgit v1.2.3-70-g09d2