Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
BC
public
liblinphone
Commits
be0807d0
Commit
be0807d0
authored
May 09, 2017
by
Ronan
Browse files
fix(core): `linphone_core_get_consolidated_presence` returns offline presence if model is null
parent
d2f8a2ba
Changes
1
Hide whitespace changes
Inline
Side-by-side
coreapi/linphonecore.c
View file @
be0807d0
...
...
@@ -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
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment