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

1 files changed, 11 insertions, 8 deletions

diff --git a/toxav/phone.c b/toxav/phone.c
index 43d24a2f..fb159f57 100755
--- a/toxav/phone.c
+++ b/toxav/phone.c
@@ -1147,18 +1147,21 @@ failed_init_ffmpeg: ;
 
 int av_terminate_session(av_session_t *_phone)
 {
-    toxav_hangup(_phone->av);
-
-    free(_phone->_friends);
-    pthread_mutex_destroy ( &_phone->_mutex );
-
+    _phone->running_decaud = 0;
+    usleep(100000); /* Wait for tox_poll to end */
+    
+    toxav_kill(_phone->av);
+    printf("\r[i] KILLED AV ARGH!\n");
+    
+    usleep(1000000); /* Wait for cancel request to be sent */
     Tox *_p = _phone->_messenger;
     _phone->_messenger = NULL;
-    usleep(100000); /* Wait for tox_poll to end */
-
     tox_kill(_p);
-    toxav_kill(_phone->av);
 
+    
+    free(_phone->_friends);
+    pthread_mutex_destroy ( &_phone->_mutex );
+    
     free(_phone);
 
     printf("\r[i] Quit!\n");