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

fix(profile): avoid deadlock with between main and core thread

The blocking connection was also blocking the callback holding the
coreLock.
This commit is contained in:
sudden6 2018-07-08 14:15:13 +02:00
parent 8e5598572a
commit aed820ba60
No known key found for this signature in database
GPG Key ID: 279509B499E032B9

View File

@ -78,7 +78,7 @@ void Profile::initCore(const QByteArray& toxsave, ICoreSettings& s)
connect(core.get(), &Core::friendAvatarRemoved, this, &Profile::removeAvatar); connect(core.get(), &Core::friendAvatarRemoved, this, &Profile::removeAvatar);
connect(core.get(), &Core::friendAvatarData, this, &Profile::saveAvatar); connect(core.get(), &Core::friendAvatarData, this, &Profile::saveAvatar);
connect(core.get(), &Core::fileAvatarOfferReceived, this, &Profile::onAvatarOfferReceived, connect(core.get(), &Core::fileAvatarOfferReceived, this, &Profile::onAvatarOfferReceived,
Qt::ConnectionType::BlockingQueuedConnection); Qt::ConnectionType::QueuedConnection);
} }
Profile::Profile(QString name, const QString& password, bool isNewProfile, const QByteArray& toxsave) Profile::Profile(QString name, const QString& password, bool isNewProfile, const QByteArray& toxsave)