Browse Source

Fix not setting tox null after cleanup

also reordered functions for super extra safety
pull/985/head
Dubslow 11 years ago
parent
commit
1d24eb14b4
No known key found for this signature in database
GPG Key ID: 3DB8E05315C220AA
  1. 11
      src/core.cpp

11
src/core.cpp

@ -90,9 +90,15 @@ Core::Core(Camera* cam, QThread *CoreThread, QString loadPath) : @@ -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() @@ -103,9 +109,6 @@ Core::~Core()
Audio::closeInput();
Audio::closeOutput();
clearPassword(Core::ptMain);
clearPassword(Core::ptHistory);
}
Core* Core::getInstance()

Loading…
Cancel
Save