From 4fc8a3aecc5918901e64486baecdf80a2e817a7b Mon Sep 17 00:00:00 2001 From: tt2468 Date: Sat, 2 Jul 2022 05:49:57 -0700 Subject: [PATCH] CI: Fix deps formatting excludes --- CI/check-format.sh | 2 +- src/eventhandler/types/EventSubscription.h | 3 ++- src/forms/SettingsDialog.cpp | 7 ++++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/CI/check-format.sh b/CI/check-format.sh index 5703af42..2d687e91 100755 --- a/CI/check-format.sh +++ b/CI/check-format.sh @@ -44,7 +44,7 @@ fi find . -type d \( \ -path ./\*build\* -o \ -path ./deps/websocketpp -o \ - -path ./deps/json -o \ + -path ./deps/asio -o \ -path ./deps/json \ \) -prune -false -type f -o \ -name '*.h' -or \ diff --git a/src/eventhandler/types/EventSubscription.h b/src/eventhandler/types/EventSubscription.h index 0acf7368..1368f07c 100644 --- a/src/eventhandler/types/EventSubscription.h +++ b/src/eventhandler/types/EventSubscription.h @@ -163,7 +163,8 @@ namespace EventSubscription { * @initialVersion 5.0.0 * @api enums */ - All = (General | Config | Scenes | Inputs | Transitions | Filters | Outputs | SceneItems | MediaInputs | Vendors | Ui), + All = (General | Config | Scenes | Inputs | Transitions | Filters | Outputs | SceneItems | MediaInputs | Vendors | + Ui), /** * Subscription value to receive the `InputVolumeMeters` high-volume event. diff --git a/src/forms/SettingsDialog.cpp b/src/forms/SettingsDialog.cpp index a3d3fce4..7fd6d973 100644 --- a/src/forms/SettingsDialog.cpp +++ b/src/forms/SettingsDialog.cpp @@ -177,9 +177,10 @@ void SettingsDialog::SaveFormData() } } - bool needsRestart = (conf->ServerEnabled != ui->enableWebSocketServerCheckBox->isChecked()) || - (conf->ServerPort != ui->serverPortSpinBox->value()) || - (ui->enableAuthenticationCheckBox->isChecked() && conf->ServerPassword != ui->serverPasswordLineEdit->text()); + bool needsRestart = + (conf->ServerEnabled != ui->enableWebSocketServerCheckBox->isChecked()) || + (conf->ServerPort != ui->serverPortSpinBox->value()) || + (ui->enableAuthenticationCheckBox->isChecked() && conf->ServerPassword != ui->serverPasswordLineEdit->text()); conf->ServerEnabled = ui->enableWebSocketServerCheckBox->isChecked(); conf->AlertsEnabled = ui->enableSystemTrayAlertsCheckBox->isChecked();