logic: Fixed every project trying to load from cdb, added warning for trial mode on failed refresh

This commit is contained in:
Eberhard Graether
2017-02-13 12:40:45 +01:00
parent d5e2bbb17c
commit 2ade5ca976
3 changed files with 16 additions and 7 deletions
+3 -5
View File
@@ -176,14 +176,12 @@ std::vector<FilePath> ProjectSettings::makePathsAbsolute(const std::vector<FileP
FilePath ProjectSettings::makePathAbsolute(const FilePath& path) const
{
FilePath basePath = getProjectFileLocation();
if (!path.isAbsolute())
if (path.empty() || path.isAbsolute())
{
return basePath.concat(path).canonical();
return path;
}
return path;
return getProjectFileLocation().concat(path).canonical();
}
std::vector<std::string> ProjectSettings::getDefaultSourceExtensions() const