mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-01-22 14:18:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

make sure Linphone Core paths are only set if not available

Browse source
This commit is contained in:
Jehan Monnier 2017-04-18 11:27:35 +02:00
parent f7857edbe0
commit 5829ccc71e
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
linphone-desktop/src/components/core/CoreManager.cpp
View file

@ -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 () {