summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorFelix Rohrbach <fxrh@gmx.de>2011-09-21 16:23:37 +0200
committerFelix Rohrbach <fxrh@gmx.de>2011-09-21 17:51:45 +0200
commit6e833fcc4ba9697df58c9a5b1bf35cbf6f0cc70e (patch)
treed6ed3aa88e25bc9562ec9f805e6953ba95394e88 /src
parentfixed my name and email, put myselve into developers list (diff)
downloadrekonq-6e833fcc4ba9697df58c9a5b1bf35cbf6f0cc70e.tar.xz
Don't crash if the rekonqui.rc file can't be found
REVIEW: 102673 CCBUG: 282474
Diffstat (limited to 'src')
-rw-r--r--src/mainwindow.cpp6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 7954bb63..528ec217 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -614,7 +614,11 @@ void MainWindow::finalizeGUI(KXMLGUIClient* client)
KXmlGuiWindow::finalizeGUI(client);
//update rekonqMenu when GUI has changed
KMenu *m = qobject_cast<KMenu*>(factory()->container("rekonqMenu", this));
- m_rekonqMenu->addActions(m->actions());
+ if (m)
+ m_rekonqMenu->addActions(m->actions());
+ else
+ kDebug() << "Could not get the rekonqMenu menu. Maybe the rekonqui.rc file wasn't found. Was"
+ << "rekonq installed correctly?";
}