Tox: #1156

- more accurate transfer management
- unlockong file on transfer pause
- added additional logs
- cleanup

1 files changed, 28 insertions, 17 deletions

diff --git a/protocols/Tox/src/tox_transfer.h b/protocols/Tox/src/tox_transfer.h
index 640a4f1305..8b0a30cb32 100644
--- a/protocols/Tox/src/tox_transfer.h
+++ b/protocols/Tox/src/tox_transfer.h
@@ -34,12 +34,36 @@ struct FileTransferParam
 		transferType = TOX_FILE_KIND_DATA;

 	}

 

-	bool OpenFile(const wchar_t *mode)

+	~FileTransferParam()

 	{

-		hFile = _wfopen(pfts.tszCurrentFile, mode);

+		if (pfts.tszWorkingDir)

+			mir_free(pfts.tszWorkingDir);

+		mir_free(pfts.pszFiles[0]);

+		mir_free(pfts.pszFiles);

+		if (hFile) {

+			fclose(hFile);

+			hFile = nullptr;

+		}

+	}

+

+	bool Resume()

+	{

+		if (hFile)

+			return true;

+		hFile = _wfopen(pfts.tszCurrentFile, L"wb+");

+		if (hFile)

+			_chsize_s(_fileno(hFile), pfts.currentFileSize);

 		return hFile != nullptr;

 	}

 

+	void Pause()

+	{

+		if (hFile) {

+			fclose(hFile);

+			hFile = nullptr;

+		}

+	}

+

 	void ChangeName(const wchar_t *fileName)

 	{

 		pfts.ptszFiles[0] = replaceStrW(pfts.tszCurrentFile, fileName);

@@ -49,19 +73,6 @@ struct FileTransferParam
 	{

 		return (pfts.flags & PFTS_SENDING) ? 0 : 1;

 	}

-

-	~FileTransferParam()

-	{

-		if (pfts.tszWorkingDir != nullptr)

-			mir_free(pfts.tszWorkingDir);

-		mir_free(pfts.pszFiles[0]);

-		mir_free(pfts.pszFiles);

-		if (hFile != nullptr)

-		{

-			fclose(hFile);

-			hFile = nullptr;

-		}

-	}

 };

 

 struct AvatarTransferParam : public FileTransferParam

@@ -114,8 +125,8 @@ public:
 	{

 		if (transfer == nullptr)

 			return;

-		transfers.erase(transfer->transferNumber);

-		delete transfer;

+		if (transfers.erase(transfer->transferNumber))

+			delete transfer;

 	}

 };