This commit is contained in:
Klaus Basan
2019-01-25 20:23:16 +01:00
committed by Mat Sutcliffe
parent a32eadee6a
commit d669f7c370
3 changed files with 7 additions and 3 deletions

View File

@@ -66,7 +66,7 @@ namespace BlackCore
if (!CContextApplicationProxy::isContextResponsive(dBusAddress, connectMsg))
{
return CStatusMessage(this, CStatusMessage::SeverityError,
"Cannot connect DBus at '" + dBusAddress + "', reason: " + connectMsg);
u"Cannot connect DBus at '" % dBusAddress % u"', reason: " % connectMsg);
}
// re-init

View File

@@ -190,13 +190,14 @@ namespace BlackGui
void CAudioSetupComponent::onLoopbackToggled(bool loopback)
{
Q_ASSERT(sGui->getIContextAudio());
if (!sGui || sGui->isShuttingDown() || !sGui->getIContextAudio()) { return; }
if (sGui->getIContextAudio()->isAudioLoopbackEnabled() == loopback) { return; }
sGui->getIContextAudio()->enableAudioLoopback(loopback);
}
void CAudioSetupComponent::onNotificationsToggled(bool checked)
{
if (!sGui || sGui->isShuttingDown() || !sGui->getIContextAudio()) { return; }
CSettings as(m_audioSettings.getThreadLocal());
as.setNotificationFlag(CNotificationSounds::PTTClick, ui->cb_SetupAudioPTTClick->isChecked());
as.setNotificationFlag(CNotificationSounds::NotificationVoiceRoomLeft, ui->cb_SetupAudioNotificationVoiceRoomLeft->isChecked());

View File

@@ -276,7 +276,10 @@ namespace BlackGui
const bool shutdown = ui->cb_Shutdown->isChecked();
if (sGui && shutdown)
{
QTimer::singleShot(1000, sGui, [] { CGuiApplication::exit(); });
QTimer::singleShot(1000, sGui, []
{
CGuiApplication::exit();
});
}
break;
}