Mirrors/PrismLauncher
1
0
Fork 0
mirror of https://github.com/PrismLauncher/PrismLauncher.git synced 2025-06-12 05:07:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

remove waitForConnected() and waitForReadyRead() and use signals ineatd

Browse Source 
Signed-off-by: iTrooz <hey@itrooz.fr>
This commit is contained in:
iTrooz
2025-01-25 20:08:44 +01:00
parent 43376b1c40
commit fe8f755b43
3 changed files with 71 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
launcher/ui/pages/instance/ServerPingTask.cpp
View File

@ -3,6 +3,11 @@
#include "ServerPingTask.h"
#include "McResolver.h"
#include "McClient.h"
#include <Json.h>
unsigned getOnlinePlayers(QJsonObject data) {
return Json::requireInteger(Json::requireObject(data, "players"), "online");
}
void ServerPingTask::executeTask() {
qDebug() << "Querying status of " << QString("%1:%2").arg(m_domain).arg(m_port);
@ -14,26 +19,21 @@ void ServerPingTask::executeTask() {
// Now that we have the IP and port, query the server
McClient *client = new McClient(nullptr, m_domain, ip, port);
auto onlineFuture = client->getOnlinePlayers();
// Wait for query to finish
QFutureWatcher<int> *watcher = new QFutureWatcher<int>();
QObject::connect(watcher, &QFutureWatcher<int>::finished, this, [this, client, onlineFuture, watcher]() {
client->deleteLater();
watcher->deleteLater();
int online = onlineFuture.result();
if (online == -1) {
qDebug() << "Failed to get online players";
emitFailed();
return;
} else {
qDebug() << "Online players: " << online;
m_outputOnlinePlayers = online;
emitSucceeded();
}
QObject::connect(client, &McClient::succeeded, this, [this](QJsonObject data) {
m_outputOnlinePlayers = getOnlinePlayers(data);
qDebug() << "Online players: " << m_outputOnlinePlayers;
emitSucceeded();
});
watcher->setFuture(onlineFuture);
QObject::connect(client, &McClient::failed, this, [this]() {
emitFailed();
});
// Delete McClient object when done
QObject::connect(client, &McClient::finished, this, [this, client]() {
client->deleteLater();
});
client->getStatusData();
});
// Delete McResolver object when done