From 8b2c3c7386bc65c770f8678dbb24234b5338f42a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82?= <zneix@zneix.eu>
Date: Sat, 5 Dec 2020 15:03:13 +0100
Subject: [PATCH] Fixed thumbnails merging with link info without thumbnails
 (#2244)

---
 src/providers/LinkResolver.cpp     |  5 +++--
 src/widgets/helper/ChannelView.cpp | 10 ++++++----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/providers/LinkResolver.cpp b/src/providers/LinkResolver.cpp
index 144f2aa4..41f511eb 100644
--- a/src/providers/LinkResolver.cpp
+++ b/src/providers/LinkResolver.cpp
@@ -32,11 +32,12 @@ void LinkResolver::getLinkInfo(
                 auto statusCode = root.value("status").toInt();
                 QString response = QString();
                 QString linkString = url;
-                ImagePtr thumbnail =
-                    Image::fromUrl({root.value("thumbnail").toString()});
+                ImagePtr thumbnail = nullptr;
                 if (statusCode == 200)
                 {
                     response = root.value("tooltip").toString();
+                    thumbnail =
+                        Image::fromUrl({root.value("thumbnail").toString()});
                     if (getSettings()->unshortLinks)
                     {
                         linkString = root.value("link").toString();
diff --git a/src/widgets/helper/ChannelView.cpp b/src/widgets/helper/ChannelView.cpp
index f0d61c26..c3701c93 100644
--- a/src/widgets/helper/ChannelView.cpp
+++ b/src/widgets/helper/ChannelView.cpp
@@ -1458,13 +1458,15 @@ void ChannelView::mouseMoveEvent(QMouseEvent *event)
             }
             else
             {
-                const auto isHideLink =
+                const auto shouldHideThumbnail =
                     isInStreamerMode() &&
                     getSettings()->streamerModeHideLinkThumbnails &&
-                    (!element->getThumbnail()->url().string.isEmpty());
+                    element->getThumbnail() != nullptr &&
+                    !element->getThumbnail()->url().string.isEmpty();
                 auto thumb =
-                    isHideLink ? Image::fromPixmap(getResources().streamerMode)
-                               : element->getThumbnail();
+                    shouldHideThumbnail
+                        ? Image::fromPixmap(getResources().streamerMode)
+                        : element->getThumbnail();
                 tooltipPreviewImage.setImage(std::move(thumb));
 
                 if (element->getThumbnailType() ==