From 62bc0ff49501348702f7e20ce2fe6524842390e3 Mon Sep 17 00:00:00 2001 From: Gluzskiy Alexandr Date: Tue, 12 Oct 2010 04:52:17 +0300 Subject: oops...) --- utilities.cpp | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) (limited to 'utilities.cpp') diff --git a/utilities.cpp b/utilities.cpp index 6d7fb58..b182f1f 100644 --- a/utilities.cpp +++ b/utilities.cpp @@ -295,8 +295,16 @@ int onProtoAck(WPARAM w, LPARAM l) case ACKRESULT_DENIED: case ACKRESULT_FAILED: { TCHAR *temp = _wgetenv(_T("TEMP")); - if(_tcsstr(f->tszCurrentFile, temp) && _tcsstr(f->tszCurrentFile, _T(".gpg"))) //ok, succesfuly sent, delete temporary file - DeleteFile(f->tszCurrentFile); + if(_tcsstr(f->tszCurrentFile, temp)) + { + if(!transfers.empty()) + { + for(list::iterator i = transfers.begin(); i != transfers.end(); i++) //bad solution + DeleteFile((*i)->file.c_str()); + transfers.clear(); + filetransfer_mutex.unlock(); + } + } return 0; } break; @@ -308,13 +316,10 @@ int onProtoAck(WPARAM w, LPARAM l) if(!transfers.empty()) { for(list::iterator i = transfers.begin(); i != transfers.end(); i++) //bad solution -// if((*i)->thread == ccs) DeleteFile((*i)->file.c_str()); transfers.clear(); filetransfer_mutex.unlock(); } -// if(_tcsstr(f->tszCurrentFile, _T(".gpg"))) //ok, succesfuly sent, delete temporary file -// DeleteFile(f->tszCurrentFile); return 0; } else if(_tcsstr(f->tszCurrentFile, _T(".gpg"))) //decrypt it -- cgit v1.2.3