summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsin <sin@2f30.org>2014-10-05 21:36:49 +0100
committersin <sin@2f30.org>2014-10-05 21:36:49 +0100
commit167560d3b43da9ebdee35374ba753280738ed4bd (patch)
treec3cb156f63e29dfbf15d758503048a88f321ba5f
parent442f78450879cb8524d21e3ec5c9080afd736f7f (diff)
Clean up calls on shutdown
-rw-r--r--ratox.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/ratox.c b/ratox.c
index 1c64adb..fc6b563 100644
--- a/ratox.c
+++ b/ratox.c
@@ -1320,7 +1320,6 @@ friendcreate(int32_t frnum)
ftruncate(f->fd[FCALL_PENDING], 0);
dprintf(f->fd[FCALL_PENDING], "0\n");
- free(f->av.frame);
f->av.state = av_CallNonExistant;
f->av.num = -1;
@@ -1336,8 +1335,11 @@ frienddestroy(struct friend *f)
canceltxtransfer(f);
cancelrxtransfer(f);
- if (f->av.state != av_CallNonExistant)
+ if (f->av.state != av_CallNonExistant) {
+ cancelrxcall(f, "Destroying");
+ canceltxcall(f, "Destroying");
toxav_kill_transmission(toxav, f->av.num);
+ }
for (i = 0; i < LEN(ffiles); i++) {
if (f->dirfd != -1) {
unlinkat(f->dirfd, ffiles[i].name, 0);