diff options
| author | Alexander Lantsev <aunsane@gmail.com> | 2016-01-08 11:43:23 +0000 |
|---|---|---|
| committer | Alexander Lantsev <aunsane@gmail.com> | 2016-01-08 11:43:23 +0000 |
| commit | ac22f38b00333bc5e040bec7a7a3fe17440d39a9 (patch) | |
| tree | 9c1743f9bda7ff595ce816807ee5366bbee8247a /protocols/Tox/src/tox_core.cpp | |
| parent | 73e5ac314f168e2159e86c4f7f4f82089d7b2363 (diff) | |
Tox:
- fixed minor issues
- updated tox core
git-svn-id: http://svn.miranda-ng.org/main/trunk@16059 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'protocols/Tox/src/tox_core.cpp')
| -rw-r--r-- | protocols/Tox/src/tox_core.cpp | 28 |
1 files changed, 12 insertions, 16 deletions
diff --git a/protocols/Tox/src/tox_core.cpp b/protocols/Tox/src/tox_core.cpp index 5ab131ea6e..f37ec8d866 100644 --- a/protocols/Tox/src/tox_core.cpp +++ b/protocols/Tox/src/tox_core.cpp @@ -37,7 +37,7 @@ Tox_Options* CToxProto::GetToxOptions() }
}
}
-
+
return options;
}
@@ -118,22 +118,18 @@ bool CToxProto::InitToxCore(CToxThread *toxThread) void CToxProto::UninitToxCore(CToxThread *toxThread)
{
- if (toxThread) {
- if (toxThread->toxAV)
- toxav_kill(toxThread->toxAV);
+ if (toxThread == NULL)
+ return;
- if (toxThread->tox)
- {
- CancelAllTransfers();
+ if (toxThread->toxAV)
+ toxav_kill(toxThread->toxAV);
- SaveToxProfile(toxThread);
+ if (toxThread->tox == NULL)
+ return;
+
+ CancelAllTransfers();
+ SaveToxProfile(toxThread);
- if (toxThread->tox != NULL)
- {
- tox_kill(toxThread->tox);
- toxThread->tox = NULL;
- }
- }
- toxThread = NULL;
- }
+ tox_kill(toxThread->tox);
+ toxThread->tox = NULL;
}
\ No newline at end of file |