┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
path: root/src/views/versioncontrol
diff options
context:
space:
mode:
authorPeter Penz <[email protected]>2011-09-18 15:06:35 +0200
committerPeter Penz <[email protected]>2011-09-18 15:07:27 +0200
commit3c41cd3c9dcae1169024e455861ee6f1515bdcc8 (patch)
tree5751f88b651f05d55c4b869ac5aa9d5c12cb0488 /src/views/versioncontrol
parent31d3b91813c2b9d74d175876d2551cca4484ab5e (diff)
Fix crash in version-control-observer
The returned file-item of the root might be null. BUG: 282108
Diffstat (limited to 'src/views/versioncontrol')
-rw-r--r--src/views/versioncontrol/versioncontrolobserver.cpp6
1 files changed, 3 insertions, 3 deletions
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<KVersionControlPlugin2*>(m_plugin);
if (pluginV2) {