Compare commits

..

2 Commits

Author SHA1 Message Date
a995cae000 set exit timer to 10 secs 2023-08-02 16:54:47 +02:00
0b7d504a7a Fixed missing git pull command.
Fixed missing update for text-edit when only clone the customer repository.
2023-08-02 16:53:19 +02:00
2 changed files with 15 additions and 1 deletions

View File

@ -62,7 +62,7 @@ void MainWindow::onStopStartTimer() {
void MainWindow::onRestartExitTimer() {
m_exitTimer->stop();
m_exitTimer->start(5 * 1000);
m_exitTimer->start(10 * 1000);
}
void MainWindow::onQuit() {

View File

@ -141,6 +141,14 @@ void Worker::privateUpdate() {
QString("#M=APISM#C=CMD_EVENT#J=") +
m_ismasClient.updateOfPSASucceeded(""));
emit setProgress(95);
m_ismasClient.setProgressInPercent(95);
IsmasClient::sendRequestReceiveResponse(IsmasClient::APISM::DB_PORT,
QString("#M=APISM#C=CMD_EVENT#J=") + m_ismasClient.updateOfPSAActivated());
//emit setProgress(100);
//m_ismasClient.setProgressInPercent(100);
//emit appendText(QString(""), UPDATE_STEP_SUCCESS);
}
} else {
// checkout branch
@ -203,6 +211,9 @@ void Worker::privateUpdate() {
if (!sentIsmasLastVersionNotification) {
// try even if the backend is not connected
sendIsmasLastVersionNotification();
emit setProgress(100);
m_ismasClient.setProgressInPercent(100);
emit appendText(QString(""), UPDATE_STEP_SUCCESS);
}
m_updateProcessRunning = false;
@ -418,6 +429,9 @@ bool Worker::filesToUpdate() {
} else {
emit appendText(QString("\nFound 1 file to update "), UPDATE_STEP_DONE);
}
if (!m_gc.gitPull()) {
emit showErrorMessage("files to update", "pulling files failed");
}
return true;
} else {
emit showErrorMessage("files to update", "no files to update (checked-in any files?)");