From 1e089e1f91c7280712d03947d60c0d922a414c34 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sat, 23 May 2015 21:53:52 +0000 Subject: FTPFile to use standard locks git-svn-id: http://svn.miranda-ng.org/main/trunk@13806 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/FTPFileYM/src/job_upload.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'plugins/FTPFileYM/src/job_upload.cpp') diff --git a/plugins/FTPFileYM/src/job_upload.cpp b/plugins/FTPFileYM/src/job_upload.cpp index ac490cf5a9..ace85a52a6 100644 --- a/plugins/FTPFileYM/src/job_upload.cpp +++ b/plugins/FTPFileYM/src/job_upload.cpp @@ -19,7 +19,7 @@ along with this program. If not, see . #include "common.h" Event UploadJob::jobDone; -Mutex UploadJob::mutexJobCount; +mir_cs UploadJob::mutexJobCount; int UploadJob::iRunningJobCount = 0; extern UploadDialog *uDlg; @@ -149,24 +149,24 @@ void UploadJob::waitingThread(void *arg) UploadJob *job = (UploadJob *)arg; while (!Miranda_Terminated()) { - Lock *lock = new Lock(mutexJobCount); + mir_cslockfull lock(mutexJobCount); if (iRunningJobCount < MAX_RUNNING_JOBS) { iRunningJobCount++; - delete lock; + lock.unlock(); job->upload(); if (!job->isCompleted()) delete job; - Lock *lock = new Lock(mutexJobCount); + lock.lock(); iRunningJobCount--; - delete lock; + lock.unlock(); jobDone.release(); return; } - delete lock; + lock.unlock(); jobDone.wait(); job->status = GenericJob::STATUS_WAITING; } -- cgit v1.2.3