Fixed a potential crash when the emotes aren't loaded, or there are less

than 12 emotes.

Signed-off-by: Ira Rice <irarice@gmail.com>

1 files changed, 1 insertions, 1 deletions

diff --git a/src/gui/emoteshortcutcontainer.cpp b/src/gui/emoteshortcutcontainer.cpp
index a7347bb0..f7917f85 100644
--- a/src/gui/emoteshortcutcontainer.cpp
+++ b/src/gui/emoteshortcutcontainer.cpp
@@ -60,7 +60,7 @@ EmoteShortcutContainer::EmoteShortcutContainer():
         mEmoteImg.push_back(player_node->getEmote(i));
     }
 
-    mMaxItems = MAX_ITEMS;
+    mMaxItems = EmoteDB::getLast() < MAX_ITEMS ? EmoteDB::getLast() : MAX_ITEMS;
 
     mBoxHeight = mBackgroundImg->getHeight();
     mBoxWidth = mBackgroundImg->getWidth();