refs #355, fixed voice room override

* missing connection for url/checkbox 2
* missing updates when values were changed
This commit is contained in:
Klaus Basan
2014-12-04 17:27:36 +01:00
parent 394b8e04f3
commit 72e7b5e26a
3 changed files with 25 additions and 17 deletions

View File

@@ -77,10 +77,10 @@ namespace BlackCore
void CContextOwnAircraft::resolveVoiceRooms()
{
CLogMessage(this, CLogCategory::contextSlot()).debug() << Q_FUNC_INFO;
if (this->m_voiceRoom1UrlOverride.isEmpty() && this->m_voiceRoom2UrlOverride.isEmpty() && !this->m_automaticVoiceRoomResolution) return;
if (!this->getIContextNetwork()) return; // no chance to resolve rooms
if (!this->getIContextAudio()) return; // no place to set rooms
if (!this->m_automaticVoiceRoomResolution) return; // not responsible
if (this->m_voiceRoom1UrlOverride.isEmpty() && this->m_voiceRoom2UrlOverride.isEmpty() && !this->m_automaticVoiceRoomResolution) { return; }
if (!this->getIContextNetwork()) { return; } // no chance to resolve rooms
if (!this->getIContextAudio()) { return; } // no place to set rooms
if (!this->m_automaticVoiceRoomResolution) { return; } // not responsible
// requires correct frequencies set
// but local network uses exactly this object here, so if frequencies are set here,