witine/linphone-ios
1
0
Fork 0
forked from mirrors/linphone-iphone
Code Pull requests Activity

fix(core): linphone_core_get_consolidated_presence returns offline presence if model is null

Browse source
This commit is contained in:
Ronan Abhamon 2017-05-09 15:46:10 +02:00
parent d2f8a2ba12
commit be0807d024
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
coreapi/linphonecore.c
View file

@ -3967,8 +3967,11 @@ LinphonePresenceModel * linphone_core_get_presence_model(const LinphoneCore *lc)
LinphoneConsolidatedPresence linphone_core_get_consolidated_presence(const LinphoneCore *lc) {
LinphoneProxyConfig *cfg = lc->default_proxy;
if ((cfg != NULL) && !linphone_proxy_config_publish_enabled(cfg)) return LinphoneConsolidatedPresenceOffline;
return linphone_presence_model_get_consolidated_presence(linphone_core_get_presence_model(lc));
LinphonePresenceModel *model = linphone_core_get_presence_model(lc);
return ((cfg && !linphone_proxy_config_publish_enabled(cfg)) || !model)
? LinphoneConsolidatedPresenceOffline
: linphone_presence_model_get_consolidated_presence(model);
}
void linphone_core_set_consolidated_presence(LinphoneCore *lc, LinphoneConsolidatedPresence presence) {