jami/jami-daemon
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-daemon.git synced 2025-08-07 22:02:12 +08:00
Code Issues Projects Releases Wiki Activity

jamiaccount: fix deadlock during device revocation

Browse Source 
Change-Id: I8ef7df59cd972868fda4e95dc0cc36ba123ffa44
This commit is contained in:
Adrien Béraud
2019-05-01 10:34:54 -04:00
committed by Sébastien Blin
parent 1629fb289d
commit 69ffe0b284
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/jamidht/jamiaccount.cpp
View File

@ -1146,7 +1146,7 @@ JamiAccount::revokeDevice(const std::string& password, const std::string& device
emitSignal<DRing::ConfigurationSignal::DeviceRevocationEnded>(getAccountID(), device, 2);
return;
}
std::lock_guard<std::mutex> lock(deviceListMutex_);
std::unique_lock<std::mutex> lock(deviceListMutex_);
foundAccountDevice(crt);
AccountArchive a;
try {
@ -1168,6 +1168,7 @@ JamiAccount::revokeDevice(const std::string& password, const std::string& device
saveKnownDevices();
emitSignal<DRing::ConfigurationSignal::DeviceRevocationEnded>(getAccountID(), device, 0);
emitSignal<DRing::ConfigurationSignal::KnownDevicesChanged>(getAccountID(), getKnownDevices());
lock.unlock();
syncDevices();
});
return true;