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/dialog.cpp | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) (limited to 'plugins/FTPFileYM/src/dialog.cpp') diff --git a/plugins/FTPFileYM/src/dialog.cpp b/plugins/FTPFileYM/src/dialog.cpp index d945d55f85..8044cfd3a7 100644 --- a/plugins/FTPFileYM/src/dialog.cpp +++ b/plugins/FTPFileYM/src/dialog.cpp @@ -21,7 +21,7 @@ along with this program. If not, see . UploadDialog *UploadDialog::instance = NULL; UploadDialog *uDlg = NULL; -Mutex UploadDialog::mutexTabs; +mir_cs UploadDialog::mutexTabs; extern Options &opt; @@ -67,7 +67,11 @@ void UploadDialog::show() } UploadDialog::Tab::Tab(GenericJob *Job) -:job(Job),bOptCloseDlg(opt.bCloseDlg),bOptCopyLink(opt.bCopyLink),bOptAutosend(opt.bAutosend),iOptAutoDelete(-1) + : job(Job), + bOptCloseDlg(opt.bCloseDlg), + bOptCopyLink(opt.bCopyLink), + bOptAutosend(opt.bAutosend), + iOptAutoDelete(-1) { if (opt.bAutoDelete) this->iOptAutoDelete = Utils::getDeleteTimeMin(); @@ -81,20 +85,19 @@ UploadDialog::Tab::Tab(GenericJob *Job) tab.mask = TCIF_TEXT; tab.pszText = Utils::getTextFragment(job->stzFileName, 20, buff); TabCtrl_InsertItem(uDlg->hwndTabs, uDlg->tabs.size(), &tab); - - Lock *lock = new Lock(mutexTabs); - uDlg->tabs.push_back(this); - delete lock; - + { + mir_cslock lock(mutexTabs); + uDlg->tabs.push_back(this); + } this->select(); } UploadDialog::Tab::~Tab() { - Lock *lock = new Lock(mutexTabs); - TabCtrl_DeleteItem(uDlg->hwndTabs, this->index()); - uDlg->tabs.erase(uDlg->tabs.begin() + this->index()); - delete lock; + { mir_cslock lock(mutexTabs); + TabCtrl_DeleteItem(uDlg->hwndTabs, this->index()); + uDlg->tabs.erase(uDlg->tabs.begin() + this->index()); + } if (this->job->isCompleted()) delete this->job; @@ -119,11 +122,10 @@ int UploadDialog::Tab::index() void UploadDialog::Tab::select() { TabCtrl_SetCurSel(uDlg->hwndTabs, this->index()); - - Lock *lock = new Lock(mutexTabs); - uDlg->activeTab = this->index(); - delete lock; - + { + mir_cslock lock(mutexTabs); + uDlg->activeTab = this->index(); + } this->job->refreshTab(true); InvalidateRect(uDlg->hwnd, NULL, TRUE); } -- cgit v1.2.3