diff options
| author | Gluzskiy Alexandr <sss123next@list.ru> | 2010-10-12 04:52:17 +0300 |
|---|---|---|
| committer | Gluzskiy Alexandr <sss123next@list.ru> | 2010-10-12 04:52:17 +0300 |
| commit | 62bc0ff49501348702f7e20ce2fe6524842390e3 (patch) | |
| tree | 2326840ec8f4e01af6940089986a72e5ddef6812 | |
| parent | 506dba1924eacf64dd067d85d9c43c25fca3a6d6 (diff) | |
oops...)
| -rw-r--r-- | utilities.cpp | 15 |
1 files changed, 10 insertions, 5 deletions
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<file_in_transfer*>::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<file_in_transfer*>::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
|