Merge branch 'master' of github.com:fourtf/chatterino2

2017-03-11 11:38:56 +01:00
parent 46f432890f 181fb69a44
commit 0ace6d2bc8
23 changed files with 536 additions and 116 deletions
@@ -10,6 +10,7 @@
 #include "resources.h"
 #include "settings.h"

+#include <QObjectUserData>
 #include <QStringList>
 #include <ctime>
 #include <list>
@@ -228,7 +229,7 @@ Message::Message(const IrcPrivateMessage &ircMessage, Channel &channel,
                    end > ircMessage.content().length())
                    continue;

-                QString name = ircMessage.content().mid(start, end - start);
+                QString name = ircMessage.content().mid(start, end - start + 1);

                twitchEmotes.push_back(std::pair<long int, LazyLoadedImage *>(
                    start, Emotes::getTwitchEmoteById(name, id)));