mirrors/linphone-iphone
1
0
Fork 1
mirror of https://gitlab.linphone.org/BC/public/linphone-iphone.git synced 2026-01-31 18:29:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix return value of MediaSession::update().

Browse source
This commit is contained in:
Ghislain MARY 2017-11-28 13:42:58 +01:00
parent 08a2180cbc
commit 56f8dcc57a
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/conference/session/media-session.cpp
View file

@ -4313,6 +4313,7 @@ LinphoneStatus MediaSession::update (const MediaSessionParams *msp, const string
L_D();
LinphoneCallState nextState;
LinphoneCallState initialState = d->state;
LinphoneStatus result = 0;
if (!d->isUpdateAllowed(nextState))
return -1;
if (d->currentParams == msp)
@ -4328,7 +4329,7 @@ LinphoneStatus MediaSession::update (const MediaSessionParams *msp, const string
lInfo() << "Defer CallSession update to gather ICE candidates";
return 0;
}
LinphoneStatus result = d->startUpdate(subject);
result = d->startUpdate(subject);
if (result && (d->state != initialState)) {
/* Restore initial state */
d->setState(initialState, "Restore initial state");
@ -4349,7 +4350,7 @@ LinphoneStatus MediaSession::update (const MediaSessionParams *msp, const string
}
#endif
}
return 0;
return result;
}
// -----------------------------------------------------------------------------