diff options
| author | Joshua Colp <jcolp@digium.com> | 2017-07-26 08:27:31 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2017-07-26 08:27:31 -0500 |
| commit | 7ea6c66968146a79869ca6813818be1c6728183d (patch) | |
| tree | f7998c571762409dec06e914c252d1b9392646de | |
| parent | 3dff2711a3bce305e61e1011d8af9d2bc3f6387d (diff) | |
| parent | 4f4936fd72d92b394362f937c13c1cc1322d27ea (diff) | |
Merge "res_stasis_device_state: Unsubscribe should remove old subscriptions"
| -rw-r--r-- | res/res_stasis_device_state.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/res/res_stasis_device_state.c b/res/res_stasis_device_state.c index 344cb40c9..276a98b93 100644 --- a/res/res_stasis_device_state.c +++ b/res/res_stasis_device_state.c @@ -106,7 +106,6 @@ static int device_state_subscriptions_cmp(void *obj, void *arg, int flags) static void device_state_subscription_destroy(void *obj) { struct device_state_subscription *sub = obj; - sub->sub = stasis_unsubscribe_and_join(sub->sub); ast_string_field_free_memory(sub); } @@ -152,6 +151,9 @@ static struct device_state_subscription *find_device_state_subscription( static void remove_device_state_subscription( struct device_state_subscription *sub) { + if (sub->sub) { + sub->sub = stasis_unsubscribe_and_join(sub->sub); + } ao2_unlink_flags(device_state_subscriptions, sub, OBJ_NOLOCK); } |