diff options
| author | Alexander Lantsev <aunsane@gmail.com> | 2015-02-09 17:54:33 +0000 |
|---|---|---|
| committer | Alexander Lantsev <aunsane@gmail.com> | 2015-02-09 17:54:33 +0000 |
| commit | c2c68d35470d448194aecf3cc4bedee5b1487f5a (patch) | |
| tree | 2ddb75b961059e69b6b4fdc1a706883eebe1027a /protocols/Tox/src/tox_account.cpp | |
| parent | 10c51cd21b16232beb4492f045b6b43ae25edea6 (diff) | |
Tox:
- enabled profile import dialog
- added global lock on file sending
- updated tox core
git-svn-id: http://svn.miranda-ng.org/main/trunk@12071 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/Tox/src/tox_account.cpp')
| -rw-r--r-- | protocols/Tox/src/tox_account.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/protocols/Tox/src/tox_account.cpp b/protocols/Tox/src/tox_account.cpp index 7a4d4515ab..6947d4f675 100644 --- a/protocols/Tox/src/tox_account.cpp +++ b/protocols/Tox/src/tox_account.cpp @@ -118,13 +118,9 @@ void CToxProto::UninitToxCore() for (size_t i = 0; i < transfers->Count(); i++)
{
FileTransferParam *transfer = transfers->GetAt(i);
- {
- mir_cslock(transfer->fileLock);
-
- transfer->status = CANCELED;
- tox_file_send_control(tox, transfer->friendNumber, transfer->GetDirection(), transfer->fileNumber, TOX_FILECONTROL_KILL, NULL, 0);
- ProtoBroadcastAck(transfer->pfts.hContact, ACKTYPE_FILE, ACKRESULT_DENIED, (HANDLE)transfer, 0);
- }
+ transfer->status = CANCELED;
+ tox_file_send_control(tox, transfer->friendNumber, transfer->GetDirection(), transfer->fileNumber, TOX_FILECONTROL_KILL, NULL, 0);
+ ProtoBroadcastAck(transfer->pfts.hContact, ACKTYPE_FILE, ACKRESULT_DENIED, (HANDLE)transfer, 0);
transfers->Remove(transfer);
}
@@ -154,7 +150,10 @@ void CToxProto::DoBootstrap() void CToxProto::DoTox()
{
- tox_do(tox);
+ {
+ mir_cslock lock(toxLock);
+ tox_do(tox);
+ }
uint32_t interval = tox_do_interval(tox);
Sleep(interval);
}
|