smw/deskflow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Only load core after settings have fully loaded (#7421)

Browse source 
* Only load core after settings have fully loaded

* Update ChangeLog
This commit is contained in:
Nick Bolton 2024-07-30 20:45:12 +01:00 committed by GitHub
parent 7c40a4d198
commit 2a6a688dbe
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ChangeLog
View file

@ -63,6 +63,7 @@ Enhancements:
- #7414 Expand BSD sockets poll tests and remove legacy-poll code - #7414 Expand BSD sockets poll tests and remove legacy-poll code
- #7415 Assert arg value `num > 0` for BSD socket poll unblock pipe - #7415 Assert arg value `num > 0` for BSD socket poll unblock pipe
- #7416 Catch exception propagating to `Server` dtor - #7416 Catch exception propagating to `Server` dtor
- #7421 Only load core after settings have fully loaded
# 1.14.6 # 1.14.6

17
src/gui/src/MainWindow.cpp
View file

@ -225,6 +225,12 @@ void MainWindow::onCreated() {
// ensure that the ctor is fully executed before we start loading the // ensure that the ctor is fully executed before we start loading the
// app config. a signal is the clearest way to communicate this. // app config. a signal is the clearest way to communicate this.
m_AppConfig.loadAllScopes(); m_AppConfig.loadAllScopes();
const auto serverEnabled = appConfig().serverGroupChecked();
const auto clientEnabled = appConfig().clientGroupChecked();
if (serverEnabled || clientEnabled) {
startCore();
}
} }
void MainWindow::onShown() { void MainWindow::onShown() {
@ -503,18 +509,11 @@ void MainWindow::createMenuBar() {
} }
void MainWindow::applyConfig() { void MainWindow::applyConfig() {
const auto serverEnabled = appConfig().serverGroupChecked(); enableServer(appConfig().serverGroupChecked());
const auto clientEnabled = appConfig().clientGroupChecked(); enableClient(appConfig().clientGroupChecked());
enableServer(serverEnabled);
enableClient(clientEnabled);
m_pLineEditHostname->setText(appConfig().serverHostname()); m_pLineEditHostname->setText(appConfig().serverHostname());
m_pLineEditClientIp->setText(serverConfig().getClientAddress()); m_pLineEditClientIp->setText(serverConfig().getClientAddress());
if (serverEnabled || clientEnabled) {
startCore();
}
} }
void MainWindow::saveSettings() { void MainWindow::saveSettings() {