From c69a83359875f9f0c04cb107ad0779f268e11d41 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Wed, 17 Apr 2019 21:57:20 +0200 Subject: [PATCH] Style --- src/blackgui/components/settingshotkeycomponent.h | 2 +- src/blackgui/components/settingssimulatorcomponent.cpp | 1 + src/blackmisc/input/actionhotkey.h | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/blackgui/components/settingshotkeycomponent.h b/src/blackgui/components/settingshotkeycomponent.h index a0d653f83..f2d9beb98 100644 --- a/src/blackgui/components/settingshotkeycomponent.h +++ b/src/blackgui/components/settingshotkeycomponent.h @@ -39,7 +39,7 @@ namespace BlackGui CSettingsHotkeyComponent(QWidget *parent = nullptr); //! Destructor - virtual ~CSettingsHotkeyComponent(); + virtual ~CSettingsHotkeyComponent() override; //! Save settings void saveSettings(); diff --git a/src/blackgui/components/settingssimulatorcomponent.cpp b/src/blackgui/components/settingssimulatorcomponent.cpp index 583b5bd30..370cc9a8e 100644 --- a/src/blackgui/components/settingssimulatorcomponent.cpp +++ b/src/blackgui/components/settingssimulatorcomponent.cpp @@ -241,6 +241,7 @@ namespace BlackGui void CSettingsSimulatorComponent::onApplyTimeSync() { + if (!sGui || sGui->isShuttingDown()) { return; } const bool timeSync = ui->cb_TimeSync->isChecked(); const QString os = ui->le_TimeSyncOffset->text(); CTime ost(0, CTimeUnit::hrmin()); diff --git a/src/blackmisc/input/actionhotkey.h b/src/blackmisc/input/actionhotkey.h index eb4e9aa92..294a0227b 100644 --- a/src/blackmisc/input/actionhotkey.h +++ b/src/blackmisc/input/actionhotkey.h @@ -11,13 +11,13 @@ #ifndef BLACKMISC_INPUT_ACTIONHOTKEY_H #define BLACKMISC_INPUT_ACTIONHOTKEY_H -#include "blackmisc/blackmiscexport.h" -#include "blackmisc/identifier.h" #include "blackmisc/input/hotkeycombination.h" #include "blackmisc/metaclass.h" #include "blackmisc/propertyindex.h" #include "blackmisc/valueobject.h" #include "blackmisc/variant.h" +#include "blackmisc/identifier.h" +#include "blackmisc/blackmiscexport.h" #include #include