diff options
| author | Alexander Lantsev <aunsane@gmail.com> | 2015-02-03 21:39:16 +0000 |
|---|---|---|
| committer | Alexander Lantsev <aunsane@gmail.com> | 2015-02-03 21:39:16 +0000 |
| commit | 2d0cbc078494bbf8f70e68fe629710bbaa30b2e8 (patch) | |
| tree | 06ac10b032a5c98fdbe2a7bec871ff1bffa4b06d /protocols/Tox/src/tox_contacts.cpp | |
| parent | ac03d5141169f1522e6b2afd8e56f0c39d4320b7 (diff) | |
Tox: rewrited file sending
git-svn-id: http://svn.miranda-ng.org/main/trunk@11998 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/Tox/src/tox_contacts.cpp')
| -rw-r--r-- | protocols/Tox/src/tox_contacts.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/protocols/Tox/src/tox_contacts.cpp b/protocols/Tox/src/tox_contacts.cpp index 0808837727..5fb359100e 100644 --- a/protocols/Tox/src/tox_contacts.cpp +++ b/protocols/Tox/src/tox_contacts.cpp @@ -257,15 +257,12 @@ void CToxProto::OnConnectionStatusChanged(Tox *tox, const int friendNumber, cons FileTransferParam *transfer = proto->transfers->GetAt(i);
if (transfer->friendNumber == friendNumber && transfer->GetDirection() == 1)
{
- if (transfer->Resume(tox) == TOX_ERROR)
+ proto->debugLogA("CToxProto::OnConnectionStatusChanged: sending ask to resume the transfer of file (%d)", transfer->fileNumber);
+ transfer->status = STARTED;
+ if (tox_file_send_control(tox, friendNumber, transfer->GetDirection(), transfer->fileNumber, TOX_FILECONTROL_RESUME_BROKEN, (uint8_t*)&transfer->pfts.currentFileProgress, sizeof(transfer->pfts.currentFileProgress)) == TOX_ERROR)
{
- transfer->Cancel(tox);
- proto->debugLogA("CToxProto::OnConnectionStatusChanged: failed to resuming of file (%d)",
- transfer->pfts.currentFileProgress, transfer->pfts.currentFileSize, transfer->fileNumber);
- continue;
+ tox_file_send_control(tox, friendNumber, transfer->GetDirection(), transfer->fileNumber, TOX_FILECONTROL_KILL, NULL, 0);
}
- proto->debugLogA("CToxProto::OnConnectionStatusChanged: ask to resume the receiving at %llu of %llu of file (%d)",
- transfer->pfts.currentFileProgress, transfer->pfts.currentFileSize, transfer->fileNumber);
}
}
}
|