Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 14:58:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Always stop challenge timer from the right thread

Browse source
This commit is contained in:
Clement 2019-09-09 16:01:45 -07:00
parent 3c35433f86
commit 3b734b2222
3 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
assignment-client/src/avatars/AvatarMixer.cpp
View file

@ -499,6 +499,8 @@ void AvatarMixer::handleAvatarKilled(SharedNodePointer avatarNode) {
} else { } else {
_sessionDisplayNames.erase(displayNameIter); _sessionDisplayNames.erase(displayNameIter);
} }
nodeData->getAvatar().stopChallengeTimer();
} }
std::unique_ptr<NLPacket> killPacket; std::unique_ptr<NLPacket> killPacket;

10
assignment-client/src/avatars/MixerAvatar.cpp
View file

@ -332,7 +332,7 @@ void MixerAvatar::sendOwnerChallenge() {
void MixerAvatar::processChallengeResponse(ReceivedMessage& response) { void MixerAvatar::processChallengeResponse(ReceivedMessage& response) {
QByteArray avatarID; QByteArray avatarID;
QMutexLocker certifyLocker(&_avatarCertifyLock); QMutexLocker certifyLocker(&_avatarCertifyLock);
QMetaObject::invokeMethod(&_challengeTimer, &QTimer::stop); stopChallengeTimer();
if (_verifyState == challengeClient) { if (_verifyState == challengeClient) {
QByteArray responseData = response.readAll(); QByteArray responseData = response.readAll();
if (responseData.length() < 8) { if (responseData.length() < 8) {
@ -365,3 +365,11 @@ void MixerAvatar::processChallengeResponse(ReceivedMessage& response) {
qCDebug(avatars) << "WARNING: Unexpected avatar challenge-response in state" << stateToName(_verifyState); qCDebug(avatars) << "WARNING: Unexpected avatar challenge-response in state" << stateToName(_verifyState);
} }
} }
void MixerAvatar::stopChallengeTimer() {
if (QThread::currentThread() == thread()) {
_challengeTimer.stop();
} else {
QMetaObject::invokeMethod(&_challengeTimer, &QTimer::stop);
}
}

2
assignment-client/src/avatars/MixerAvatar.h
View file

@ -34,6 +34,8 @@ public:
void processCertifyEvents(); void processCertifyEvents();
void processChallengeResponse(ReceivedMessage& response); void processChallengeResponse(ReceivedMessage& response);
void stopChallengeTimer();
// Avatar certification/verification: // Avatar certification/verification:
enum VerifyState { enum VerifyState {
nonCertified, requestingFST, receivedFST, staticValidation, requestingOwner, ownerResponse, nonCertified, requestingFST, receivedFST, staticValidation, requestingOwner, ownerResponse,