Commit 5829ccc7 authored by Jehan Monnier's avatar Jehan Monnier

make sure Linphone Core paths are only set if not available

parent f7857edb
......@@ -92,9 +92,18 @@ void CoreManager::setDatabasesPaths () {
}
void CoreManager::setOtherPaths () {
mCore->setZrtpSecretsFile(Paths::getZrtpSecretsFilepath());
mCore->setUserCertificatesPath(Paths::getUserCertificatesDirpath());
mCore->setRootCa(Paths::getRootCaFilepath());
if (mCore->getZrtpSecretsFile().empty())
mCore->setZrtpSecretsFile(Paths::getZrtpSecretsFilepath());
// This one is actually a database but it MUST be set after the zrtp secrets
// as it allows automatic migration from old version(secrets, xml) to new version (data, sqlite).
mCore->setZrtpCacheDatabasePath(Paths::getZrtpDataFilepath());
if (mCore->getUserCertificatesPath().empty())
mCore->setUserCertificatesPath(Paths::getUserCertificatesDirpath());
if (mCore->getRootCa().empty())
mCore->setRootCa(Paths::getRootCaFilepath());
}
void CoreManager::setResourcesPaths () {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment