From: Daniel Faust <hessijames@gmail.com>
Date: Fri, 10 May 2013 20:27:22 +0000 (+0200)
Subject: Don't try to change the icon of the "sort" action menu if it doesn't exist
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/3f108bd7fa8a063b07da66ab1e15c65a18db5ed4

Don't try to change the icon of the "sort" action menu if it doesn't exist

BUG: 255819
FIXED-IN: 4.10.4
REVIEW: 109966
---

diff --git a/src/views/dolphinviewactionhandler.cpp b/src/views/dolphinviewactionhandler.cpp
index c7832d725..730723785 100644
--- a/src/views/dolphinviewactionhandler.cpp
+++ b/src/views/dolphinviewactionhandler.cpp
@@ -528,8 +528,10 @@ void DolphinViewActionHandler::slotSortRoleChanged(const QByteArray& role)
     if (action) {
         action->setChecked(true);
 
-        QAction* sortByMenu =  m_actionCollection->action("sort");
-        sortByMenu->setIcon(KIcon(action->icon()));
+        if (!action->icon().isNull()) {
+            QAction* sortByMenu = m_actionCollection->action("sort");
+            sortByMenu->setIcon(KIcon(action->icon()));
+        }
     }
 }