From cf77d0ff7642f36385103fd5ca918dcd979c8fc0 Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Wed, 17 Jan 2024 15:28:49 +0100 Subject: [PATCH] Initialize m_versionInfo and send its contents to ISMAS in the update-process. --- worker.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/worker.cpp b/worker.cpp index 239b562..d3e7c3c 100644 --- a/worker.cpp +++ b/worker.cpp @@ -140,6 +140,7 @@ Worker::Worker(int customerNr, , m_serialInterface(serialInterface) , m_baudrate(baudrate) , m_gc(m_customerNrStr, m_customerRepository, m_workingDirectory, m_branchName, this) + , m_versionInfo(QStringList()) , m_osVersion(getOsVersion()) , m_atbqtVersion(getATBQTVersion()) , m_atbUpdateToolVersion(getATBUpdateToolVersion()) @@ -301,6 +302,9 @@ void Worker::privateUpdate() { setProgress(i); // and switch to branch if (m_gc.gitCloneAndCheckoutBranch()) { if (!isRepositoryCorrupted()) { + if (m_versionInfo.size() == 0) { + m_versionInfo = m_gc.gitShowReason(m_branchName); + } GUI() << (ISMAS() << (CONSOLE() << UPDATE_STEP::CLONE_REPOSITORY_SUCCESS)); continueUpdate = true; m_clone = true; @@ -330,6 +334,11 @@ void Worker::privateUpdate() { } } } + + if (m_versionInfo.size() == 0) { + m_versionInfo = m_gc.gitShowReason(m_branchName); + } + CONSOLE() << UPDATE_STEP::CHECK_REPOSITORY_SUCCESS; setProgress(_CHECKOUT_REPOSITORY_SUCCESS);