Merge branch 'split-video' of https://github.com/notsecure/toxcore into notsecure-split-video

2 files changed, 3 insertions, 3 deletions

diff --git a/toxav/msi.c b/toxav/msi.c
index 10eac60c..73429a81 100644
--- a/toxav/msi.c
+++ b/toxav/msi.c
@@ -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");
     }
 
-free_end:
     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;
 
     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 );
 
     session->calls[call_index]->state = call_active;
diff --git a/toxav/toxav.c b/toxav/toxav.c
index ebe32fe4..dfb5dce3 100644
--- a/toxav/toxav.c
+++ b/toxav/toxav.c
@@ -272,7 +272,7 @@ int toxav_reject ( ToxAv *av, int32_t call_index, const char *reason )
         return ErrorInvalidState;
     }
 
-    return msi_reject(av->msi_session, call_index, (const uint8_t *) reason);
+    return msi_reject(av->msi_session, call_index, reason);
 }
 
 /**