kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-08-22 01:40:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix crashing on launch

Browse source
This commit is contained in:
Martin T. H. Sandsmark 2021-01-04 19:33:58 +01:00 committed by Elvis Angelaccio
parent 49e8b67b71
commit a993a5979d
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/views/versioncontrol/versioncontrolobserver.cpp
View file

@ -112,7 +112,7 @@ QList<QAction*> VersionControlObserver::actions(const KFileItemList& items) cons
return m_plugin->versionControlActions(items);
} else {
QList<QAction*> actions;
for (const auto &plugin : qAsConst(m_plugins)) {
for (const QPointer<KVersionControlPlugin> &plugin : qAsConst(m_plugins)) {
actions << plugin->outOfVersionControlActions(items);
}
return actions;
@ -306,14 +306,18 @@ KVersionControlPlugin* VersionControlObserver::searchPlugin(const QUrl& director
initPlugins();
// Verify whether the current directory is under a version system
for (const auto &plugin : qAsConst(m_plugins)) {
for (const QPointer<KVersionControlPlugin> &plugin : qAsConst(m_plugins)) {
if (!plugin) {
continue;
}
// first naively check if we are at working copy root
const QString fileName = directory.path() + '/' + plugin->fileName();
if (QFile::exists(fileName)) {
m_localRepoRoot = directory.path();
return plugin;
}
auto root = plugin->localRepositoryRoot(directory.path());
const QString root = plugin->localRepositoryRoot(directory.path());
if (!root.isEmpty()) {
m_localRepoRoot = root;
return plugin;

2
src/views/versioncontrol/versioncontrolobserver.h
View file

@ -146,7 +146,7 @@ private:
bool m_pluginsInitialized;
KVersionControlPlugin* m_plugin;
QList<KVersionControlPlugin*> m_plugins;
QList<QPointer<KVersionControlPlugin>> m_plugins;
UpdateItemStatesThread* m_updateItemStatesThread;
friend class UpdateItemStatesThread;