mirror of
https://github.com/irungentoo/toxcore.git
synced 2024-03-22 13:30:51 +08:00
Merge branch 'split-video' of https://github.com/notsecure/toxcore into notsecure-split-video
This commit is contained in:
commit
f6d829d8f0
|
@ -1411,7 +1411,6 @@ static void msi_handle_packet ( Messenger *messenger, int source, const uint8_t
|
||||||
LOGGER_WARNING("Invalid message: no resp nor requ headers");
|
LOGGER_WARNING("Invalid message: no resp nor requ headers");
|
||||||
}
|
}
|
||||||
|
|
||||||
free_end:
|
|
||||||
free ( msg );
|
free ( msg );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1658,7 +1657,8 @@ int msi_answer ( MSISession *session, int32_t call_index, MSICallType call_type
|
||||||
session->calls[call_index]->type_local = call_type;
|
session->calls[call_index]->type_local = call_type;
|
||||||
|
|
||||||
msi_msg_set_calltype(msg_starting, call_type);
|
msi_msg_set_calltype(msg_starting, call_type);
|
||||||
send_message ( session, session->calls[call_index], msg_starting, 0 );
|
|
||||||
|
send_message ( session, session->calls[call_index], msg_starting, session->calls[call_index]->peers[0] );
|
||||||
free ( msg_starting );
|
free ( msg_starting );
|
||||||
|
|
||||||
session->calls[call_index]->state = call_active;
|
session->calls[call_index]->state = call_active;
|
||||||
|
|
|
@ -272,7 +272,7 @@ int toxav_reject ( ToxAv *av, int32_t call_index, const char *reason )
|
||||||
return ErrorInvalidState;
|
return ErrorInvalidState;
|
||||||
}
|
}
|
||||||
|
|
||||||
return msi_reject(av->msi_session, call_index, (const uint8_t *) reason);
|
return msi_reject(av->msi_session, call_index, reason);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in New Issue
Block a user