Don't overwrite custom icons for the show_hidden_files action

BUG: 374508
FIXED-IN: 16.12.2
REVIEW: 129789
This commit is contained in:
Elvis Angelaccio 2017-01-14 12:52:58 +01:00
parent 44b668e9fb
commit 85121a8115

View file

@ -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")));
}