From: Elvis Angelaccio <elvis.angelaccio@kde.org>
Date: Sat, 14 Jan 2017 11:52:58 +0000 (+0100)
Subject: Don't overwrite custom icons for the show_hidden_files action
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/85121a8115c5a8b6b7c0a01073663d51bd64e6ae?ds=inline

Don't overwrite custom icons for the show_hidden_files action

BUG: 374508
FIXED-IN: 16.12.2
REVIEW: 129789
---

diff --git a/src/views/dolphinviewactionhandler.cpp b/src/views/dolphinviewactionhandler.cpp
index 5c0b49cd2..273bcdd76 100644
--- a/src/views/dolphinviewactionhandler.cpp
+++ b/src/views/dolphinviewactionhandler.cpp
@@ -482,6 +482,12 @@ void DolphinViewActionHandler::slotHiddenFilesShownChanged(bool shown)
     QAction* showHiddenFilesAction = m_actionCollection->action(QStringLiteral("show_hidden_files"));
     showHiddenFilesAction->setChecked(shown);
 
+    // #374508: don't overwrite custom icons.
+    const QString iconName = showHiddenFilesAction->icon().name();
+    if (!iconName.isEmpty() && iconName != QLatin1String("visibility") && iconName != QLatin1String("hint")) {
+        return;
+    }
+
     showHiddenFilesAction->setIcon(QIcon::fromTheme(shown ? QStringLiteral("visibility") : QStringLiteral("hint")));
 }