Merge branch 'master' of https://github.com/mannol1/ProjectTox-Core into mannol1-master

This commit is contained in:
irungentoo 2014-05-29 16:55:46 -04:00
commit 1963a306cc
No known key found for this signature in database
GPG Key ID: 10349DC9BED89E98

View File

@ -1027,7 +1027,7 @@ void *handle_timeout ( void *arg )
/* uint16_t _it = 0; /* uint16_t _it = 0;
* for ( ; _it < _session->call->peer_count; _it++ ) */ * for ( ; _it < _session->call->peer_count; _it++ ) */
msi_cancel ( _call->session, _call->call_idx, _call->peers [0], "Request timed out" ); msi_cancel ( _call->session, _call->call_idx, _call->peers [0], "Request timed out" );
terminate_call(_call->session, _call); /*terminate_call(_call->session, _call);*/
} }
pthread_exit(NULL); pthread_exit(NULL);