From 158203ce2caba3882c0f6712b20ccc2276c55ba2 Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter@praktik.cz>
Date: Tue, 18 May 2021 14:00:43 +0200
Subject: [PATCH] fix some unwanted freshrss behavior

---
 resources/desktop/com.github.rssguard.appdata.xml   |  2 +-
 src/librssguard/services/greader/greadernetwork.cpp | 13 +++++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/resources/desktop/com.github.rssguard.appdata.xml b/resources/desktop/com.github.rssguard.appdata.xml
index 21d0e0830..a3fcc13e9 100644
--- a/resources/desktop/com.github.rssguard.appdata.xml
+++ b/resources/desktop/com.github.rssguard.appdata.xml
@@ -30,7 +30,7 @@
   <url type="donation">https://martinrotter.github.io/donate/</url>
   <content_rating type="oars-1.1" />
   <releases>
-    <release version="3.9.2" date="2021-05-17"/>
+    <release version="3.9.2" date="2021-05-18"/>
   </releases>
   <content_rating type="oars-1.0">
     <content_attribute id="violence-cartoon">none</content_attribute>
diff --git a/src/librssguard/services/greader/greadernetwork.cpp b/src/librssguard/services/greader/greadernetwork.cpp
index c65672d1d..c2b4693e7 100755
--- a/src/librssguard/services/greader/greadernetwork.cpp
+++ b/src/librssguard/services/greader/greadernetwork.cpp
@@ -333,16 +333,25 @@ RootItem* GreaderNetwork::decodeTagsSubscriptions(const QString& categories, con
       QString icon_url = subscription["iconUrl"].toString();
       QList<QPair<QString, bool>> icon_urls;
 
-      icon_urls.append({ url, false });
-
       if (!icon_url.isEmpty()) {
         if (icon_url.startsWith(QSL("//"))) {
           icon_url = QUrl(baseUrl()).scheme() + QSL(":") + icon_url;
         }
+        else if (service() == GreaderServiceRoot::Service::FreshRss) {
+          QUrl icon_url_obj(icon_url);
+          QUrl base_url(baseUrl());
+
+          if (icon_url_obj.host() == base_url.host()) {
+            icon_url_obj.setPort(base_url.port());
+            icon_url = icon_url_obj.toString();
+          }
+        }
 
         icon_urls.append({ icon_url, true });
       }
 
+      icon_urls.append({ url, false });
+
       QIcon icon;
 
       if (NetworkFactory::downloadIcon(icon_urls,