From 007dc97cf79202b1a6e89f18397639e35a00ab6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20B=C3=A9raud?= <adrien.beraud@savoirfairelinux.com>
Date: Mon, 22 Jan 2018 14:34:26 -0500
Subject: [PATCH] account: read correct "active" property
Used to read the "enabled" property instead of "active".
Change-Id: I8d9751f55b5c68ae857a15887536d866c42a0982
---
src/account.cpp | 2 +-
src/manager.cpp | 7 +++----
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/src/account.cpp b/src/account.cpp
index 0cbda061f4..2e11b822f8 100644
--- a/src/account.cpp
+++ b/src/account.cpp
@@ -309,7 +309,7 @@ Account::getVolatileAccountDetails() const
{
return {
{Conf::CONFIG_ACCOUNT_REGISTRATION_STATUS, mapStateNumberToString(registrationState_)},
- {DRing::Account::VolatileProperties::ACTIVE, enabled_ ? TRUE_STR : FALSE_STR}
+ {DRing::Account::VolatileProperties::ACTIVE, active_ ? TRUE_STR : FALSE_STR}
};
}
diff --git a/src/manager.cpp b/src/manager.cpp
index 78062d1acf..3f5e231ec8 100644
--- a/src/manager.cpp
+++ b/src/manager.cpp
@@ -2657,10 +2657,6 @@ Manager::setAccountDetails(const std::string& accountID,
account->doRegister();
else
account->doUnregister();
-
- // Update account details to the client side
- emitSignal<DRing::ConfigurationSignal::VolatileDetailsChanged>(accountID,
- details);
});
}
@@ -3004,6 +3000,9 @@ Manager::setAccountActive(const std::string& accountID, bool active)
else
acc->doUnregister();
}
+ emitSignal<DRing::ConfigurationSignal::VolatileDetailsChanged>(
+ accountID,
+ acc->getVolatileAccountDetails());
}
std::shared_ptr<AudioLayer>
--
GitLab