diff --git a/src/manager.cpp b/src/manager.cpp index 00e2362772d9f0b248d9f6e9f3197c1477c067b5..f5dd8dc0e3e1238deeed457bf0093c1b7d807611 100644 --- a/src/manager.cpp +++ b/src/manager.cpp @@ -1939,8 +1939,7 @@ Manager::playRingtone(const std::string& accountID) ringchoice = std::string(PROGSHAREDIR) + DIR_SEPARATOR_STR + RINGDIR + DIR_SEPARATOR_STR + ringchoice; #else - ringchoice = std::string("") + DIR_SEPARATOR_STR - + RINGDIR + DIR_SEPARATOR_STR + ringchoice; + ringchoice = std::string(""); #endif } diff --git a/src/media/audio/tonecontrol.cpp b/src/media/audio/tonecontrol.cpp index 2f682d5d94c09dc35dc22f47b850899a7675e1a7..ede7a491bbb6a53d1d1f2477ce96b0eed9ba6b3f 100644 --- a/src/media/audio/tonecontrol.cpp +++ b/src/media/audio/tonecontrol.cpp @@ -70,6 +70,9 @@ ToneControl::getTelephoneFile(void) bool ToneControl::setAudioFile(const std::string& file) { + if (file.empty()) + return false; + std::lock_guard<std::mutex> lk(mutex_); if (audioFile_) { diff --git a/src/security/certstore.cpp b/src/security/certstore.cpp index 2f70c7b5d8aa768314ddf98ab108204fcb1c2177..6b7dfc42a2e50d9c62fec75bd6d51582506d9c6a 100644 --- a/src/security/certstore.cpp +++ b/src/security/certstore.cpp @@ -564,7 +564,7 @@ TrustStore::updateKnownCerts() void TrustStore::setStoreCertStatus(const crypto::Certificate& crt, TrustStore::PermissionStatus status) { - if (not crt.isCA()) + if (not crt.isCA() || not allowed_) return; if (status == PermissionStatus::ALLOWED)