StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

simplification

Browse Source
This commit is contained in:
Dubslow 2014-09-10 08:36:11 -05:00
parent 05c654373f
commit b684e56df0
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core.cpp
View File

@ -859,7 +859,7 @@ QString Core::sanitize(QString name)
} }
void Core::loadConfiguration(QString path) void Core::loadConfiguration(QString path)
{ // also loadFriends/clearFriends is borked as fuck {
// setting the profile is now the responsibility of the caller // setting the profile is now the responsibility of the caller
QFile conf(path); QFile conf(path);
qDebug() << "Core::loadConfiguration: reading from " << path; qDebug() << "Core::loadConfiguration: reading from " << path;
@ -959,6 +959,7 @@ void Core::switchConfiguration(QString profile)
toxav_kill(toxav); toxav_kill(toxav);
tox_kill(tox); tox_kill(tox);
} }
emit clearFriends();
get_tox(); get_tox();
@ -970,7 +971,6 @@ void Core::loadFriends()
{ {
const uint32_t friendCount = tox_count_friendlist(tox); const uint32_t friendCount = tox_count_friendlist(tox);
if (friendCount > 0) { if (friendCount > 0) {
emit clearFriends();
// assuming there are not that many friends to fill up the whole stack // assuming there are not that many friends to fill up the whole stack
int32_t *ids = new int32_t[friendCount]; int32_t *ids = new int32_t[friendCount];
tox_get_friendlist(tox, ids, friendCount); tox_get_friendlist(tox, ids, friendCount);