summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2015-09-17 16:49:30 +0000
committerGeorge Hazan <george.hazan@gmail.com>2015-09-17 16:49:30 +0000
commit26f8fb4e20c14e47284ba27effb0c5ba8455e6e5 (patch)
tree7dea6bfecd00fe7453d8936efcac05d0bdca3714
parentb0abf16219e63aef53b91fa89252b5f6ceb318ad (diff)
crash fix
git-svn-id: http://svn.miranda-ng.org/main/trunk@15371 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
-rw-r--r--protocols/Tox/src/tox_core.cpp3
-rw-r--r--protocols/Tox/src/tox_network.cpp1
2 files changed, 3 insertions, 1 deletions
diff --git a/protocols/Tox/src/tox_core.cpp b/protocols/Tox/src/tox_core.cpp
index a2da0b3e85..bcd8ade298 100644
--- a/protocols/Tox/src/tox_core.cpp
+++ b/protocols/Tox/src/tox_core.cpp
@@ -124,6 +124,7 @@ void CToxProto::UninitToxCore()
SaveToxProfile();
tox_kill(toxThread->tox);
- this->toxThread = NULL;
}
+
+ toxThread = NULL;
} \ No newline at end of file
diff --git a/protocols/Tox/src/tox_network.cpp b/protocols/Tox/src/tox_network.cpp
index 9520672494..e87981ef40 100644
--- a/protocols/Tox/src/tox_network.cpp
+++ b/protocols/Tox/src/tox_network.cpp
@@ -150,6 +150,7 @@ void CToxProto::PollingThread(void*)
if (!InitToxCore())
{
+ UninitToxCore();
SetStatus(ID_STATUS_OFFLINE);
ProtoBroadcastAck(NULL, ACKTYPE_LOGIN, ACKRESULT_FAILED, NULL, LOGINERR_WRONGPASSWORD);
logger->Log(__FUNCTION__": leaving");