avoid two possible null pointer dereferences

move the setToolTip lines outside the if(action) inside it.
do not crash if there is no action.

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index 1150b74883500a23da9f758deb811c32eb85d163..1b2b971c2cb459188a68e3bf401b46229be18c9c 100644 (file)
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -441,14 +441,14 @@ void DolphinMainWindow::updateHistory()
     const int index = urlNavigator->historyIndex();
 
     QAction* backAction = actionCollection()->action("go_back");
     const int index = urlNavigator->historyIndex();
 
     QAction* backAction = actionCollection()->action("go_back");

-    backAction->setToolTip(i18nc("@info", "Go back"));

     if (backAction) {
     if (backAction) {

+        backAction->setToolTip(i18nc("@info", "Go back"));

         backAction->setEnabled(index < urlNavigator->historySize() - 1);
     }
 
     QAction* forwardAction = actionCollection()->action("go_forward");
         backAction->setEnabled(index < urlNavigator->historySize() - 1);
     }
 
     QAction* forwardAction = actionCollection()->action("go_forward");

-    forwardAction->setToolTip(i18nc("@info", "Go forward"));

     if (forwardAction) {
     if (forwardAction) {

+        forwardAction->setToolTip(i18nc("@info", "Go forward"));

         forwardAction->setEnabled(index > 0);
     }
 }
         forwardAction->setEnabled(index > 0);
     }
 }