Skip to content

fix(ipc): remove dupe git sha from version display #209

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nbolton merged 1 commit into from
Jun 18, 2026
Merged

fix(ipc): remove dupe git sha from version display #209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/lib/deskflow/ipc/IpcServer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,8 @@ void IpcServer::processMessage(QLocalSocket *clientSocket, const QString &messag
return;
}

const auto versionId = QStringLiteral("%1+%2").arg(kVersion, kVersionGitSha);
// Divergence from upstream: kVersion already carries the build metadata; don't re-append the git sha.
const auto versionId = QString::fromUtf8(kVersion);
const auto clientVersion = parts.at(1);
LOG_DEBUG("%s ipc server got hello message (version: %s)", m_typeName.constData(), versionId.toUtf8().constData());

Expand Down
5 changes: 3 additions & 2 deletions src/lib/gui/dialogs/AboutDialog.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,9 @@ AboutDialog::AboutDialog(QWidget *parent) : QDialog(parent), ui{std::make_unique

void AboutDialog::copyVersionText() const
{
QString infoString = QStringLiteral("%1: %2 (%3)\nQt: %4\nSystem: %5")
.arg(kAppName, kVersion, kVersionGitSha, qVersion(), QSysInfo::prettyProductName());
// Divergence from upstream: kDisplayVersion already carries version + commit; don't append the git sha.
QString infoString = QStringLiteral("%1: %2\nQt: %3\nSystem: %4")
.arg(kAppName, kDisplayVersion, qVersion(), QSysInfo::prettyProductName());
if (Settings::isPortableMode()) {
infoString.append(QStringLiteral("\nPortable Mode"));
}
Expand Down
6 changes: 4 additions & 2 deletions src/lib/gui/ipc/IpcClient.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,8 @@ void IpcClient::attemptConnection()
connect(
m_socket, &QLocalSocket::connected, this,
[this] {
const auto versionId = QStringLiteral("%1+%2").arg(kVersion, kVersionGitSha);
// Divergence from upstream: kVersion already carries the build metadata; don't re-append the git sha.
const auto versionId = QString::fromUtf8(kVersion);
m_socket->write(QStringLiteral("hello=%1\n").arg(versionId).toUtf8());
qDebug().noquote() << QStringLiteral("%1 ipc client sent hello with version: %2").arg(m_typeName, versionId);
},
Expand Down Expand Up @@ -176,7 +177,8 @@ void IpcClient::handleHandshakeMessage(const QStringList &parts)
return;
}

const auto versionId = QStringLiteral("%1+%2").arg(kVersion, kVersionGitSha);
// Divergence from upstream: kVersion already carries the build metadata; don't re-append the git sha.
const auto versionId = QString::fromUtf8(kVersion);

if (parts.at(0) == QStringLiteral("versionMismatch")) {
const auto serverVersion = parts.size() >= 2 ? parts.at(1) : QStringLiteral("unknown");
Expand Down
Loading