diff --git a/src/lib/gui/MainWindow.cpp b/src/lib/gui/MainWindow.cpp index ba1c82191c..9c982d879b 100644 --- a/src/lib/gui/MainWindow.cpp +++ b/src/lib/gui/MainWindow.cpp @@ -275,7 +275,6 @@ void MainWindow::connectSlots() connect(Settings::instance(), &Settings::serverSettingsChanged, this, &MainWindow::serverConfigSaving); connect(Settings::instance(), &Settings::settingsChanged, this, &MainWindow::settingsChanged); - connect(&m_coreProcess, &CoreProcess::starting, this, &MainWindow::coreProcessStarting, Qt::DirectConnection); connect(&m_coreProcess, &CoreProcess::error, this, &MainWindow::coreProcessError); connect(&m_coreProcess, &CoreProcess::logLine, this, &MainWindow::handleLogLine); connect( @@ -994,6 +993,10 @@ void MainWindow::coreProcessStateChanged(CoreProcessState state) m_actionRestartCore->setVisible(true); m_actionStopCore->setEnabled(true); + if (state == CoreProcessState::Starting) { + coreProcessStarting(); + } + } else { disconnect(ui->btnToggleCore, &QPushButton::clicked, m_actionStopCore, &QAction::trigger); connect(ui->btnToggleCore, &QPushButton::clicked, m_actionStartCore, &QAction::trigger, Qt::UniqueConnection); diff --git a/src/lib/gui/core/CoreProcess.cpp b/src/lib/gui/core/CoreProcess.cpp index a1e97711e0..b8e19584c3 100644 --- a/src/lib/gui/core/CoreProcess.cpp +++ b/src/lib/gui/core/CoreProcess.cpp @@ -302,13 +302,7 @@ void CoreProcess::start(std::optional processModeOption) qInfo().noquote() << QString("starting %1 process (%2 mode)").arg(coreMode, processModeToString(processMode)); - // allow external listeners to abort the start process (e.g. licensing issue). setProcessState(ProcessState::Starting); - Q_EMIT starting(); - if (m_processState == ProcessState::Stopped) { - qDebug("core process start was cancelled by listener"); - return; - } #ifdef Q_OS_MAC requestOSXNotificationPermission(); diff --git a/src/lib/gui/core/CoreProcess.h b/src/lib/gui/core/CoreProcess.h index dd5f0a30f5..34e73f2216 100644 --- a/src/lib/gui/core/CoreProcess.h +++ b/src/lib/gui/core/CoreProcess.h @@ -96,7 +96,6 @@ public: } Q_SIGNALS: - void starting(); void error(deskflow::gui::CoreProcess::Error error); void logLine(const QString &line); void connectionStateChanged(deskflow::gui::CoreProcess::ConnectionState state);