From 12e020b7c24c571d53b7628ead97b31de71a91a2 Mon Sep 17 00:00:00 2001
From: Xaver Maierhofer <xaver.maierhofer@xwissen.info>
Date: Sat, 13 Apr 2019 14:29:56 +0200
Subject: [PATCH] Add option to prefer DuckDuckGo

---
 src/gui/ApplicationSettingsWidgetSecurity.ui | 2 +-
 src/gui/EditWidgetIcons.cpp                  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/gui/ApplicationSettingsWidgetSecurity.ui b/src/gui/ApplicationSettingsWidgetSecurity.ui
index 344c2b81..527110e6 100644
--- a/src/gui/ApplicationSettingsWidgetSecurity.ui
+++ b/src/gui/ApplicationSettingsWidgetSecurity.ui
@@ -212,7 +212,7 @@
       <item>
        <widget class="QCheckBox" name="fallbackToSearch">
         <property name="text">
-         <string>Use DuckDuckGo as fallback for downloading website icons</string>
+         <string>Use DuckDuckGo to download website icons</string>
         </property>
        </widget>
       </item>
diff --git a/src/gui/EditWidgetIcons.cpp b/src/gui/EditWidgetIcons.cpp
index 242ae454..36c88e73 100644
--- a/src/gui/EditWidgetIcons.cpp
+++ b/src/gui/EditWidgetIcons.cpp
@@ -223,16 +223,16 @@ void EditWidgetIcons::downloadFavicon()
         QUrl fallbackUrl = QUrl("https://icons.duckduckgo.com");
         fallbackUrl.setPath("/ip3/" + QUrl::toPercentEncoding(fullyQualifiedDomain) + ".ico");
 
-        m_urlsToTry.append(fallbackUrl);
-
         if (!hostIsIp) {
             QString secondLevelDomain = getSecondLevelDomain(m_url);
 
             if (fullyQualifiedDomain != secondLevelDomain) {
                 fallbackUrl.setPath("/ip3/" + QUrl::toPercentEncoding(secondLevelDomain) + ".ico");
-                m_urlsToTry.append(fallbackUrl);
+                m_urlsToTry.prepend(fallbackUrl);
             }
         }
+
+        m_urlsToTry.prepend(fallbackUrl);
     }
 
     startFetchFavicon(m_urlsToTry.takeFirst());