Merge pull request #934 from pavlukivan/master

use shortcode as a fallback for custom emote title

1 files changed, 3 insertions, 1 deletions

diff --git a/src/CombinedImagePackModel.cpp b/src/CombinedImagePackModel.cpp

index 27b96b92..6dadbef4 100644
--- a/src/CombinedImagePackModel.cpp
+++ b/src/CombinedImagePackModel.cpp
@@ -60,7 +60,9 @@ CombinedImagePackModel::data(const QModelIndex &index, int role) const
             return QStringLiteral(
                      "<img data-mx-emoticon height=32 src=\"%1\" alt=\"%2\" title=\"%2\">")
               .arg(QString::fromStdString(images[index.row()].image.url).toHtmlEscaped(),
-                   QString::fromStdString(images[index.row()].image.body));
+                   !images[index.row()].image.body.empty()
+                     ? QString::fromStdString(images[index.row()].image.body)
+                     : images[index.row()].shortcode);
         case Roles::Url:
             return QString::fromStdString(images[index.row()].image.url);
         case CompletionModel::SearchRole: