feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

CorePlugin: Do not check recent files for existence

Browse Source 
Previously recent files would be restored before devices were
intialized. Remote paths would therefore be removed since their
existence could not be verified.

Change-Id: I0412cec9587fd104580a694f20bdd0ec54e35b3e
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Marcus Tillmanns
2022-10-14 10:56:47 +02:00
parent e7b1561cc7
commit 0d1e1ebab6
1 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/plugins/coreplugin/documentmanager.cpp
View File

@@ -1376,6 +1376,21 @@ void DocumentManager::saveSettings()
s->endGroup();
}
void restoreRecentFiles(const QVariantList &recentFiles, const QStringList &recentEditorIds)
{
QList<DocumentManager::RecentFile> result;
for (int i = 0, n = recentFiles.size(); i < n; ++i) {
QString editorId;
if (i < recentEditorIds.size()) // guard against old or weird settings
editorId = recentEditorIds.at(i);
const Utils::FilePath &filePath = FilePath::fromVariant(recentFiles.at(i));
result.append({filePath, Id::fromString(editorId)});
}
d->m_recentFiles = result;
}
void readSettings()
{
QSettings *s = ICore::settings();
@@ -1384,23 +1399,14 @@ void readSettings()
const QVariantList recentFiles = s->value(QLatin1String(filesKeyC)).toList();
const QStringList recentEditorIds = s->value(QLatin1String(editorsKeyC)).toStringList();
s->endGroup();
// clean non-existing files
for (int i = 0, n = recentFiles.size(); i < n; ++i) {
QString editorId;
if (i < recentEditorIds.size()) // guard against old or weird settings
editorId = recentEditorIds.at(i);
const Utils::FilePath &filePath = FilePath::fromVariant(recentFiles.at(i));
if (filePath.exists() && !filePath.isDir())
d->m_recentFiles.append({filePath, Id::fromString(editorId)});
}
restoreRecentFiles(recentFiles, recentEditorIds);
s->beginGroup(QLatin1String(directoryGroupC));
const FilePath settingsProjectDir = FilePath::fromString(s->value(QLatin1String(projectDirectoryKeyC),
QString()).toString());
if (!settingsProjectDir.isEmpty() && settingsProjectDir.isDir())
d->m_projectsDirectory = settingsProjectDir;
else
d->m_projectsDirectory = PathChooser::homePath();
d->m_projectsDirectory = FilePath::fromVariant(
s->value(QLatin1String(projectDirectoryKeyC), PathChooser::homePath().toVariant()));
d->m_useProjectsDirectory
= s->value(QLatin1String(useProjectDirectoryKeyC), kUseProjectsDirectoryDefault).toBool();