diff --git a/launcher/ui/pages/instance/McResolver.cpp b/launcher/ui/pages/instance/McResolver.cpp index 1159e5df2..6dd37ff8b 100644 --- a/launcher/ui/pages/instance/McResolver.cpp +++ b/launcher/ui/pages/instance/McResolver.cpp @@ -64,11 +64,11 @@ void McResolver::pingWithDomainA(QString domain, int port) { void McResolver::emitFail(std::string error) { qDebug() << "Ping error:" << QString::fromStdString(error); - emit fail(); - emit finish(); + emit failed(); + emit finished(); } void McResolver::emitSucceed(QString ip, int port) { - emit succeed(ip, port); - emit finish(); + emit succeeded(ip, port); + emit finished(); } diff --git a/launcher/ui/pages/instance/McResolver.h b/launcher/ui/pages/instance/McResolver.h index 5de4e8de4..4837b029e 100644 --- a/launcher/ui/pages/instance/McResolver.h +++ b/launcher/ui/pages/instance/McResolver.h @@ -22,7 +22,7 @@ private: void emitSucceed(QString ip, int port); signals: - void succeed(QString ip, int port); - void fail(); - void finish(); + void succeeded(QString ip, int port); + void failed(); + void finished(); }; diff --git a/launcher/ui/pages/instance/ServersPage.cpp b/launcher/ui/pages/instance/ServersPage.cpp index 62742076a..875d63869 100644 --- a/launcher/ui/pages/instance/ServersPage.cpp +++ b/launcher/ui/pages/instance/ServersPage.cpp @@ -143,7 +143,7 @@ class ServerPingTask : public Task { // Resolve the actual IP and port for the server auto [domain, port] = m_server.splitAddress(); McResolver *resolver = new McResolver(nullptr, domain, port); - QObject::connect(resolver, &McResolver::succeed, [this, resolver, domain](QString ip, int port) { + QObject::connect(resolver, &McResolver::succeeded, [this, resolver, domain](QString ip, int port) { qDebug() << "Resolved Address for" << domain << ": " << ip << ":" << port; // Now that we have the IP and port, query the server @@ -160,7 +160,7 @@ class ServerPingTask : public Task { }); // Delete McResolver object when done - QObject::connect(resolver, &McResolver::finish, [resolver]() { + QObject::connect(resolver, &McResolver::finished, [resolver]() { resolver->deleteLater(); }); resolver->ping();