1
0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00

Fix not setting tox null after cleanup

also reordered functions for super extra safety
This commit is contained in:
Dubslow 2014-12-03 18:52:10 -06:00
parent 1ebcad7ad8
commit 85fcdd7653
No known key found for this signature in database
GPG Key ID: 3DB8E05315C220AA

View File

@ -90,9 +90,15 @@ Core::Core(Camera* cam, QThread *CoreThread, QString loadPath) :
Core::~Core()
{
if (tox) {
clearPassword(Core::ptMain);
clearPassword(Core::ptHistory);
if (tox)
{
toxav_kill(toxav);
toxav = nullptr;
tox_kill(tox);
tox = nullptr;
}
if (videobuf)
@ -103,9 +109,6 @@ Core::~Core()
Audio::closeInput();
Audio::closeOutput();
clearPassword(Core::ptMain);
clearPassword(Core::ptHistory);
}
Core* Core::getInstance()