Compare commits
No commits in common. "a995cae000d1549a3ffd77142fed3989b5b66f8a" and "6a4a852fd6e97af8c372d4b23e8338228893afa0" have entirely different histories.
a995cae000
...
6a4a852fd6
@ -62,7 +62,7 @@ void MainWindow::onStopStartTimer() {
|
||||
|
||||
void MainWindow::onRestartExitTimer() {
|
||||
m_exitTimer->stop();
|
||||
m_exitTimer->start(10 * 1000);
|
||||
m_exitTimer->start(5 * 1000);
|
||||
}
|
||||
|
||||
void MainWindow::onQuit() {
|
||||
|
14
worker.cpp
14
worker.cpp
@ -141,14 +141,6 @@ 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
|
||||
@ -211,9 +203,6 @@ 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;
|
||||
@ -429,9 +418,6 @@ 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?)");
|
||||
|
Loading…
x
Reference in New Issue
Block a user