From cf2b413f295dbafa970e676169a4437c95a08596 Mon Sep 17 00:00:00 2001 From: iTrooz Date: Sat, 25 Jan 2025 20:10:26 +0100 Subject: [PATCH] forward McClient error as Task error Signed-off-by: iTrooz --- launcher/ui/pages/instance/McClient.cpp | 2 +- launcher/ui/pages/instance/McClient.h | 2 +- launcher/ui/pages/instance/ServerPingTask.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/launcher/ui/pages/instance/McClient.cpp b/launcher/ui/pages/instance/McClient.cpp index 474490018..05d4ac31a 100644 --- a/launcher/ui/pages/instance/McClient.cpp +++ b/launcher/ui/pages/instance/McClient.cpp @@ -149,7 +149,7 @@ void McClient::writePacketToSocket(QByteArray &data) { void McClient::emitFail(QString error) { qDebug() << "Minecraft server ping for status error:" << error; - emit failed(); + emit failed(error); emit finished(); } diff --git a/launcher/ui/pages/instance/McClient.h b/launcher/ui/pages/instance/McClient.h index 820ce255b..55d0350d1 100644 --- a/launcher/ui/pages/instance/McClient.h +++ b/launcher/ui/pages/instance/McClient.h @@ -40,6 +40,6 @@ private: signals: void succeeded(QJsonObject data); - void failed(); + void failed(QString error); void finished(); }; diff --git a/launcher/ui/pages/instance/ServerPingTask.cpp b/launcher/ui/pages/instance/ServerPingTask.cpp index 0574dfca1..f0dfb8cd7 100644 --- a/launcher/ui/pages/instance/ServerPingTask.cpp +++ b/launcher/ui/pages/instance/ServerPingTask.cpp @@ -25,8 +25,8 @@ void ServerPingTask::executeTask() { qDebug() << "Online players: " << m_outputOnlinePlayers; emitSucceeded(); }); - QObject::connect(client, &McClient::failed, this, [this]() { - emitFailed(); + QObject::connect(client, &McClient::failed, this, [this](QString error) { + emitFailed(error); }); // Delete McClient object when done