diff options
| author | Tobias Weimer <wishmaster51@googlemail.com> | 2015-06-17 23:15:57 +0000 |
|---|---|---|
| committer | Tobias Weimer <wishmaster51@googlemail.com> | 2015-06-17 23:15:57 +0000 |
| commit | 65cf85ee6e83594f4de5d6d06012bde070b6c6b1 (patch) | |
| tree | 50b3747038b77088ee0bef29f6594a74807397c3 /protocols/Gadu-Gadu/src/filetransfer.cpp | |
| parent | 2d26921c87c663de4725963d7da87c6eacd1e3d3 (diff) | |
GaduGadu: Cleanup
git-svn-id: http://svn.miranda-ng.org/main/trunk@14241 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/Gadu-Gadu/src/filetransfer.cpp')
| -rw-r--r-- | protocols/Gadu-Gadu/src/filetransfer.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/protocols/Gadu-Gadu/src/filetransfer.cpp b/protocols/Gadu-Gadu/src/filetransfer.cpp index 61d8ab6014..932aa9f94e 100644 --- a/protocols/Gadu-Gadu/src/filetransfer.cpp +++ b/protocols/Gadu-Gadu/src/filetransfer.cpp @@ -908,7 +908,6 @@ int GGPROTO::RecvFile(MCONTACT hContact, PROTORECVFILET* pre) HANDLE GGPROTO::SendFile(MCONTACT hContact, const TCHAR* szDescription, TCHAR** ppszFiles)
{
char *bslash, *filename;
- struct gg_dcc *dcc;
DWORD ip, ver;
WORD port;
uin_t myuin, uin;
@@ -928,10 +927,10 @@ HANDLE GGPROTO::SendFile(MCONTACT hContact, const TCHAR* szDescription, TCHAR** // Use DCC7 if a contact is using at least version 7.6 or unknown version
if ((ver & 0x00ffffff) >= 0x29 || !ver) {
- struct gg_dcc7 *dcc7;
gg_EnterCriticalSection(&sess_mutex, "SendFile", 46, "sess_mutex", 1);
- if (!(dcc7 = gg_dcc7_send_file(sess, uin, filename, NULL, NULL))) {
+ struct gg_dcc7 *dcc7 = gg_dcc7_send_file(sess, uin, filename, NULL, NULL);
+ if (!dcc7) {
gg_LeaveCriticalSection(&sess_mutex, "SendFile", 46, 1, "sess_mutex", 1);
debugLogA("SendFile(): Failed to send file \"%s\".", filename);
mir_free(filename);
@@ -967,6 +966,7 @@ HANDLE GGPROTO::SendFile(MCONTACT hContact, const TCHAR* szDescription, TCHAR** }
// Try to connect if not ask user to connect me
+ struct gg_dcc *dcc = NULL;
if ((ip && port >= 10 && !(dcc = gg_dcc_send_file(ip, port, myuin, uin))) || (port < 10 && port > 0))
{
// Make fake dcc structure
|