diff options
| author | George Hazan <george.hazan@gmail.com> | 2012-05-18 21:36:53 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2012-05-18 21:36:53 +0000 |
| commit | e328df9bdc816810545b91dccd52e7741e962dc0 (patch) | |
| tree | 3f118077918773ba4b6d835c72ce7068c12ce496 /plugins/SecureIM/svcs_proto.cpp | |
| parent | 5e4ecb158a9835d79536326835287d49f22d65f1 (diff) | |
bunch of fixes
git-svn-id: http://svn.miranda-ng.org/main/trunk@57 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/SecureIM/svcs_proto.cpp')
| -rw-r--r-- | plugins/SecureIM/svcs_proto.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/plugins/SecureIM/svcs_proto.cpp b/plugins/SecureIM/svcs_proto.cpp index b1f6910686..e6e538c60a 100644 --- a/plugins/SecureIM/svcs_proto.cpp +++ b/plugins/SecureIM/svcs_proto.cpp @@ -1040,20 +1040,20 @@ int __cdecl onProtoAck(WPARAM wParam,LPARAM lParam) { PROTOFILETRANSFERSTATUS *f = (PROTOFILETRANSFERSTATUS*) ack->lParam;
pUinKey ptr = getUinKey(ack->hContact);
- if (!ptr || (f && f->sending && !bSFT)) return 0;
+ if (!ptr || (f && (f->flags & PFTS_SENDING) && !bSFT)) return 0;
if( isContactSecured(ack->hContact)&SECURED ) {
switch(ack->result) {
// case ACKRESULT_FILERESUME:
case ACKRESULT_DATA: {
- if( !f->sending ) {
+ if( !( f->flags & PFTS_SENDING )) {
ptr->finFileRecv = (f->currentFileSize == f->currentFileProgress);
- if( !ptr->lastFileRecv ) ptr->lastFileRecv = mir_strdup(f->currentFile);
+ if( !ptr->lastFileRecv ) ptr->lastFileRecv = mir_strdup(f->szCurrentFile);
}
else
- if( f->sending ) {
+ if( f->flags & PFTS_SENDING ) {
ptr->finFileSend = (f->currentFileSize == f->currentFileProgress);
- if( !ptr->lastFileSend ) ptr->lastFileSend = mir_strdup(f->currentFile);
+ if( !ptr->lastFileSend ) ptr->lastFileSend = mir_strdup(f->szCurrentFile);
}
} break;
// case ACKRESULT_INITIALISING:
|