ynkmr/Sourcetrail
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

logic: Don't set project state outdated if only source group name changed (issue #700)

Browse Source
This commit is contained in:
Eberhard Graether
2019-05-27 18:04:29 +02:00
parent b6a39a2d66
commit 150240a9af
4 changed files with 22 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/project/Project.cpp
+11 -8
View File
@@ -179,16 +179,19 @@ void Project::load(std::shared_ptr<DialogView> dialogView)
{
m_state = PROJECT_STATE_OUTVERSIONED;
}
else if (utility::replace(TextAccess::createFromFile(projectSettingsPath)->getText(), "\r", "") !=
utility::replace(TextAccess::createFromString(m_storage->getProjectSettingsText())->getText(), "\r", ""))
{
m_state = PROJECT_STATE_OUTDATED;
canLoad = true;
}
else
{
m_state = PROJECT_STATE_LOADED;
canLoad = true;
ProjectSettings storedSettings;
if (storedSettings.loadFromString(m_storage->getProjectSettingsText()) && m_settings->equalsExceptNameAndLocation(storedSettings))
{
m_state = PROJECT_STATE_LOADED;
canLoad = true;
}
else
{
m_state = PROJECT_STATE_OUTDATED;
canLoad = true;
}
}
try