From: Peter Penz Date: Sun, 18 Sep 2011 13:06:35 +0000 (+0200) Subject: Fix crash in version-control-observer X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/3c41cd3c9dcae1169024e455861ee6f1515bdcc8 Fix crash in version-control-observer The returned file-item of the root might be null. BUG: 282108 --- diff --git a/src/views/versioncontrol/versioncontrolobserver.cpp b/src/views/versioncontrol/versioncontrolobserver.cpp index 20b059035..86049efa3 100644 --- a/src/views/versioncontrol/versioncontrolobserver.cpp +++ b/src/views/versioncontrol/versioncontrolobserver.cpp @@ -146,8 +146,8 @@ void VersionControlObserver::verifyDirectory() return; } - const KUrl versionControlUrl = m_model->rootItem().url(); - if (!versionControlUrl.isLocalFile()) { + const KFileItem rootItem = m_model->rootItem(); + if (rootItem.isNull() || !rootItem.url().isLocalFile()) { return; } @@ -155,7 +155,7 @@ void VersionControlObserver::verifyDirectory() m_plugin->disconnect(this); } - m_plugin = searchPlugin(versionControlUrl); + m_plugin = searchPlugin(rootItem.url()); if (m_plugin) { KVersionControlPlugin2* pluginV2 = qobject_cast(m_plugin); if (pluginV2) {