jami/jami-daemon
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-daemon.git synced 2025-08-12 22:09:25 +08:00
Code Issues Projects Releases Wiki Activity

manager: don't delete account if alias is empty

Browse Source 
Change-Id: I93cc9a7e2c365bf84f64ef6ffbd05131b76ccfae
This commit is contained in:
Adrien Béraud
2018-10-22 01:07:23 -04:00
parent 87259d0b0e
commit 1e2e3c9a7b
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/manager.cpp
View File

@ -557,13 +557,11 @@ Manager::ManagerPimpl::loadAccount(const YAML::Node &node, int &errorCount,
std::string accountid;
parseValue(node, "id", accountid);
std::string accountAlias;
parseValue(node, "alias", accountAlias);
const auto inAccountOrder = [&](const std::string & id) {
return accountOrder.find(id + "/") != std::string::npos;
};
if (!accountid.empty() and !accountAlias.empty()) {
if (!accountid.empty()) {
if (not inAccountOrder(accountid)) {
RING_WARN("Dropping account %s, which is not in account order", accountid.c_str());
} else if (base_.accountFactory.isSupportedType(accountType.c_str())) {