From 439c565961c695f09a5f0b591de06fa2be25a350 Mon Sep 17 00:00:00 2001 From: iTrooz Date: Sat, 25 Jan 2025 20:14:15 +0100 Subject: [PATCH] forward McResolver error as Task error Signed-off-by: iTrooz --- launcher/ui/pages/instance/McResolver.cpp | 4 ++-- launcher/ui/pages/instance/McResolver.h | 2 +- launcher/ui/pages/instance/ServerPingTask.cpp | 3 +++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/launcher/ui/pages/instance/McResolver.cpp b/launcher/ui/pages/instance/McResolver.cpp index 80f93d9f8..48c2a72fd 100644 --- a/launcher/ui/pages/instance/McResolver.cpp +++ b/launcher/ui/pages/instance/McResolver.cpp @@ -62,8 +62,8 @@ void McResolver::pingWithDomainA(QString domain, int port) { } void McResolver::emitFail(QString error) { - qDebug() << "Ping error:" << error; - emit failed(); + qDebug() << "DNS resolver error:" << error; + emit failed(error); emit finished(); } diff --git a/launcher/ui/pages/instance/McResolver.h b/launcher/ui/pages/instance/McResolver.h index e2840fd8a..06b4b7b38 100644 --- a/launcher/ui/pages/instance/McResolver.h +++ b/launcher/ui/pages/instance/McResolver.h @@ -23,6 +23,6 @@ private: signals: void succeeded(QString ip, int port); - 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 f0dfb8cd7..3ec9308ca 100644 --- a/launcher/ui/pages/instance/ServerPingTask.cpp +++ b/launcher/ui/pages/instance/ServerPingTask.cpp @@ -35,6 +35,9 @@ void ServerPingTask::executeTask() { }); client->getStatusData(); }); + QObject::connect(resolver, &McResolver::failed, this, [this](QString error) { + emitFailed(error); + }); // Delete McResolver object when done QObject::connect(resolver, &McResolver::finished, [resolver]() {