flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-26 02:35:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T491, style/minor tweaks

Browse Source
This commit is contained in:
Klaus Basan
2018-12-30 04:12:56 +01:00
committed by Mat Sutcliffe
parent e810dfecf5
commit 03ac54cefa
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/blackgui/components/textmessagecomponent.cpp
View File

@@ -430,7 +430,7 @@ namespace BlackGui
textEdit->insertTextMessage(textMessage); textEdit->insertTextMessage(textMessage);
// sound // sound
if (!m_usedAsOverlayWidget && sGui && sGui->getIContextAudio()) if (!m_usedAsOverlayWidget && sGui && !sGui->isShuttingDown() && sGui->getIContextAudio())
{ {
sGui->getIContextAudio()->playNotification(CNotificationSounds::NotificationTextMessagePrivate, true); sGui->getIContextAudio()->playNotification(CNotificationSounds::NotificationTextMessagePrivate, true);
} }

2
src/blackgui/components/textmessagecomponent.h
View File

@@ -106,7 +106,7 @@ namespace BlackGui
QScopedPointer<Ui::CTextMessageComponent> ui; QScopedPointer<Ui::CTextMessageComponent> ui;
BlackMisc::CIdentifier m_identifier { "TextMessageComponent", this }; BlackMisc::CIdentifier m_identifier { "TextMessageComponent", this };
BlackMisc::CSetting<Settings::TextMessageSettings> m_messageSettings { this, &CTextMessageComponent::onSettingsChanged }; BlackMisc::CSetting<Settings::TextMessageSettings> m_messageSettings { this, &CTextMessageComponent::onSettingsChanged };
bool m_usedAsOverlayWidget = false; //!< disables dockwidget parts bool m_usedAsOverlayWidget = false; //!< disables dockwidget parts if used as overlay widget
//! Enum to widget //! Enum to widget
QWidget *getTabWidget(TextMessageTab tab) const; QWidget *getTabWidget(TextMessageTab tab) const;

1
src/swiftguistandard/swiftguistd.cpp
View File

@@ -447,6 +447,7 @@ void SwiftGuiStd::playNotifcationSound(CNotificationSounds::Notification notific
{ {
if (!m_contextAudioAvailable) { return; } if (!m_contextAudioAvailable) { return; }
if (!ui->comp_MainInfoArea->getSettingsComponent()->playNotificationSounds()) { return; } if (!ui->comp_MainInfoArea->getSettingsComponent()->playNotificationSounds()) { return; }
if (!sGui || sGui->isShuttingDown()) { return; }
sGui->getIContextAudio()->playNotification(notification, true); sGui->getIContextAudio()->playNotification(notification, true);
} }