GerhardHoffmann/ATBUpdateTool
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

call onQuit() directly whem timer runs out

Browse Source
This commit is contained in:
Gerhard Hoffmann 2023-08-03 10:14:09 +02:00
parent ef88fdc9a4
commit c6e98f50c2
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mainwindow.cpp
View File

@ -28,7 +28,8 @@ MainWindow::MainWindow(Worker *worker, QWidget *parent)
m_exitTimer->start(1800 * 1000); m_exitTimer->start(1800 * 1000);
connect(m_startTimer, SIGNAL(timeout()), ui->start, SLOT(click())); connect(m_startTimer, SIGNAL(timeout()), ui->start, SLOT(click()));
connect(m_exitTimer, SIGNAL(timeout()), ui->exit, SLOT(click())); //connect(m_exitTimer, SIGNAL(timeout()), ui->exit, SLOT(click()));
connect(m_exitTimer, SIGNAL(timeout()), ui->exit, SLOT(onQuit()));
connect(ui->start, SIGNAL(clicked()), m_worker, SLOT(update())); connect(ui->start, SIGNAL(clicked()), m_worker, SLOT(update()));
connect(ui->exit, SIGNAL(clicked()), this, SLOT(onQuit())); connect(ui->exit, SIGNAL(clicked()), this, SLOT(onQuit()));
connect(m_worker, SIGNAL(disableExit()), this, SLOT(onDisableExit())); connect(m_worker, SIGNAL(disableExit()), this, SLOT(onDisableExit()));
@ -76,10 +77,10 @@ void MainWindow::onRestartExitTimer() {
} }
void MainWindow::onQuit() { void MainWindow::onQuit() {
if (!m_worker->updateProcessRunning()) { // if (!m_worker->updateProcessRunning()) {
// qApp->quit(); qCritical() << "ON QUIT: EXIT CODE" << QString::number(m_worker->returnCode());
qApp->exit(m_worker->returnCode()); qApp->exit(m_worker->returnCode());
} //}
} }
void MainWindow::onSetProgress(quint8 v) { void MainWindow::onSetProgress(quint8 v) {
@ -108,5 +109,5 @@ void MainWindow::onAppendText(QString text, QString suffix) {
} }
void MainWindow::onShowErrorMessage(QString title, QString text) { void MainWindow::onShowErrorMessage(QString title, QString text) {
QMessageBox::critical(this, title, text, QMessageBox::Ok); // QMessageBox::critical(this, title, text, QMessageBox::Ok);
} }