diff --git a/src/chat.c b/src/chat.c index 74e988d..a4c771d 100644 --- a/src/chat.c +++ b/src/chat.c @@ -448,7 +448,7 @@ static void chat_onFileControl(ToxWindow *self, Tox *m, int32_t num, uint8_t rec switch (control_type) { case TOX_FILECONTROL_ACCEPT: - if (receive_send == 1) { + if (receive_send == 1 && file_senders[send_idx].last_progress == 0) { line_info_add(self, NULL, NULL, NULL, SYS_MSG, 0, 0, "File transfer [%d] for '%s' accepted.", filenum, filename); /* prep progress bar line */ @@ -515,7 +515,7 @@ static void chat_onFileControl(ToxWindow *self, Tox *m, int32_t num, uint8_t rec memcpy(&datapos, tmp, sizeof(uint64_t)); if (fseek(fp, datapos, SEEK_SET) == -1) { - snprintf(msg, sizeof(msg), "File transfer for '%s' failed.", filename); + snprintf(msg, sizeof(msg), "File transfer for '%s' failed to resume", filename); close_file_sender(self, m, send_idx, NULL, TOX_FILECONTROL_FINISHED, filenum, num); break; } diff --git a/src/file_senders.c b/src/file_senders.c index 8dafb28..f75e8b1 100644 --- a/src/file_senders.c +++ b/src/file_senders.c @@ -270,7 +270,6 @@ void do_file_senders(Tox *m) char msg[MAX_STR_SIZE]; snprintf(msg, sizeof(msg), "File transfer for '%s' timed out.", filename); close_file_sender(self, m, i, msg, TOX_FILECONTROL_KILL, filenum, friendnum); - sound_notify(self, error, NT_NOFOCUS | NT_WNDALERT_2, NULL); if (self->active_box != -1) box_notify2(self, error, NT_NOFOCUS | NT_WNDALERT_2, self->active_box, "%s", msg);