diff --git a/daemon/src/managerimpl.cpp b/daemon/src/managerimpl.cpp index a9b190d1ad311a14c10e0b6d12b8097d43343a7c..3cb0d6cac8174d20f071d62352b6c2e7a21865cc 100644 --- a/daemon/src/managerimpl.cpp +++ b/daemon/src/managerimpl.cpp @@ -131,10 +131,12 @@ void ManagerImpl::terminate() saveConfig(); - unloadAccountMap(); - delete SIPVoIPLink::instance(); + // Unload account map AFTER destroying + // the SIPVoIPLink, the link still needs the accounts for pjsip cleanup + unloadAccountMap(); + ost::MutexLock lock(audioLayerMutex_); delete audiodriver_;