refs #804 Fixed Clang static analysis warnings.

This commit is contained in:
Mathew Sutcliffe
2016-11-15 00:29:59 +00:00
committed by Klaus Basan
parent 132ffa9ec2
commit 096e1e9a81
2 changed files with 11 additions and 5 deletions

View File

@@ -148,9 +148,15 @@ namespace BlackSound
}
else
{
if (this->m_pushTimer) this->m_pushTimer->stop();
this->m_pushTimer->disconnect(this);
if (this->m_playMode == CNotificationSounds::SingleWithAutomaticDeletion) this->stop();
if (this->m_pushTimer)
{
this->m_pushTimer->stop();
this->m_pushTimer->disconnect(this);
}
if (this->m_playMode == CNotificationSounds::SingleWithAutomaticDeletion)
{
this->stop();
}
}
}

View File

@@ -299,8 +299,8 @@ void SwiftGuiStd::setContextAvailability()
sGui &&
this->isMyIdentifier(sGui->getIContextApplication()->registerApplication(getCurrentTimestampIdentifier()));
}
this->m_contextNetworkAvailable = this->m_coreAvailable || sGui->getIContextNetwork()->isUsingImplementingObject();
this->m_contextAudioAvailable = this->m_coreAvailable || sGui->getIContextAudio()->isUsingImplementingObject();
this->m_contextNetworkAvailable = this->m_coreAvailable || (sGui && sGui->getIContextNetwork()->isUsingImplementingObject());
this->m_contextAudioAvailable = this->m_coreAvailable || (sGui && sGui->getIContextAudio()->isUsingImplementingObject());
// react to a change in core's availability
if (this->m_coreAvailable != corePreviouslyAvailable)