projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upstream version 7.36.149.0
[platform/framework/web/crosswalk.git]
/
src
/
third_party
/
libjingle
/
source
/
talk
/
p2p
/
base
/
session.cc
diff --git
a/src/third_party/libjingle/source/talk/p2p/base/session.cc
b/src/third_party/libjingle/source/talk/p2p/base/session.cc
index
3520984
..
a48f3cb
100644
(file)
--- a/
src/third_party/libjingle/source/talk/p2p/base/session.cc
+++ b/
src/third_party/libjingle/source/talk/p2p/base/session.cc
@@
-284,9
+284,12
@@
bool TransportProxy::SetLocalTransportDescription(
if (action == CA_ANSWER) {
CompleteNegotiation();
}
if (action == CA_ANSWER) {
CompleteNegotiation();
}
- return transport_->get()->SetLocalTransportDescription(description,
- action,
- error_desc);
+ bool result = transport_->get()->SetLocalTransportDescription(description,
+ action,
+ error_desc);
+ if (result)
+ local_description_set_ = true;
+ return result;
}
bool TransportProxy::SetRemoteTransportDescription(
}
bool TransportProxy::SetRemoteTransportDescription(
@@
-297,9
+300,12
@@
bool TransportProxy::SetRemoteTransportDescription(
if (action == CA_ANSWER) {
CompleteNegotiation();
}
if (action == CA_ANSWER) {
CompleteNegotiation();
}
- return transport_->get()->SetRemoteTransportDescription(description,
- action,
- error_desc);
+ bool result = transport_->get()->SetRemoteTransportDescription(description,
+ action,
+ error_desc);
+ if (result)
+ remote_description_set_ = true;
+ return result;
}
void TransportProxy::OnSignalingReady() {
}
void TransportProxy::OnSignalingReady() {