summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan-Simon Moeller <jsmoeller@linuxfoundation.org>2018-11-02 12:28:45 +0000
committerGerrit Code Review <gerrit@automotivelinux.org>2018-11-02 12:28:45 +0000
commit575649de494a94b83dfb589914d83b11ff3df37e (patch)
tree2c1d735122985a6d5097d31252883f17d312ef1a
parentf056ae01a6e8bdcf510710b0fd49d3f55dc54b16 (diff)
parent2df32d051f3154576cd0eb807f2bf132172ff16d (diff)
Merge "Don't automatically close already closed roles"
-rw-r--r--ahl-binding/role.cpp38
1 files changed, 21 insertions, 17 deletions
diff --git a/ahl-binding/role.cpp b/ahl-binding/role.cpp
index b48b58e..1114973 100644
--- a/ahl-binding/role.cpp
+++ b/ahl-binding/role.cpp
@@ -206,23 +206,27 @@ void role_t::open(afb_req_t r, json_object* o)
[](void* arg)
{
role_t * role = (role_t*) arg;
- afb_api_t api = ahl_binding_t::instance().handle();
-
- AFB_API_DEBUG(api, "Released role %s\n", role->uid_.c_str());
- role->opened_ = false;
-
- // send a mute command to the HAL. We cannot reuse the do_mute function,
- // because in the context here, the afb_req_t is no longer valid.
- json_object* a = json_object_new_object();
- json_object_object_add(a, "mute", json_object_new_boolean(true));
-
- afb_api_call(
- api,
- role->hal_.c_str(),
- role->stream_.c_str(),
- a,
- NULL,
- NULL);
+
+ if (role->opened_)
+ {
+ afb_api_t api = ahl_binding_t::instance().handle();
+
+ AFB_API_DEBUG(api, "Released role %s\n", role->uid_.c_str());
+ role->opened_ = false;
+
+ // send a mute command to the HAL. We cannot reuse the do_mute function,
+ // because in the context here, the afb_req_t is no longer valid.
+ json_object* a = json_object_new_object();
+ json_object_object_add(a, "mute", json_object_new_boolean(true));
+
+ afb_api_call(
+ api,
+ role->hal_.c_str(),
+ role->stream_.c_str(),
+ a,
+ NULL,
+ NULL);
+ }
}
);
opened_ = true;