From 27f276ef13f49b4d21b6c17db5d4cd5e404ea259 Mon Sep 17 00:00:00 2001 From: Petr Mrázek Date: Sun, 31 Oct 2021 21:42:06 +0100 Subject: GH-1795 add terminal launch option to use a specific Minecraft profile Used like this: ``` ./MultiMC --launch 1.17.1 --profile MultiMCTest --server mc.hypixel.net ``` --- libraries/LocalPeer/include/LocalPeer.h | 4 ++-- libraries/LocalPeer/src/LocalPeer.cpp | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) (limited to 'libraries/LocalPeer') diff --git a/libraries/LocalPeer/include/LocalPeer.h b/libraries/LocalPeer/include/LocalPeer.h index a24e4775..3619ed5d 100644 --- a/libraries/LocalPeer/include/LocalPeer.h +++ b/libraries/LocalPeer/include/LocalPeer.h @@ -83,11 +83,11 @@ public: LocalPeer(QObject *parent, const ApplicationId &appId); ~LocalPeer(); bool isClient(); - bool sendMessage(const QString &message, int timeout); + bool sendMessage(const QByteArray &message, int timeout); ApplicationId applicationId() const; Q_SIGNALS: - void messageReceived(const QString &message); + void messageReceived(const QByteArray &message); protected Q_SLOTS: void receiveConnection(); diff --git a/libraries/LocalPeer/src/LocalPeer.cpp b/libraries/LocalPeer/src/LocalPeer.cpp index 129f3abc..cb218466 100644 --- a/libraries/LocalPeer/src/LocalPeer.cpp +++ b/libraries/LocalPeer/src/LocalPeer.cpp @@ -155,7 +155,7 @@ bool LocalPeer::isClient() } -bool LocalPeer::sendMessage(const QString &message, int timeout) +bool LocalPeer::sendMessage(const QByteArray &message, int timeout) { if (!isClient()) return false; @@ -177,7 +177,7 @@ bool LocalPeer::sendMessage(const QString &message, int timeout) return false; } - QByteArray uMsg(message.toUtf8()); + QByteArray uMsg(message); QDataStream ds(&socket); ds.writeBytes(uMsg.constData(), uMsg.size()); @@ -232,10 +232,9 @@ void LocalPeer::receiveConnection() delete socket; return; } - QString message(QString::fromUtf8(uMsg)); socket->write(ack, qstrlen(ack)); socket->waitForBytesWritten(1000); socket->waitForDisconnected(1000); // make sure client reads ack delete socket; - emit messageReceived(message); //### (might take a long time to return) + emit messageReceived(uMsg); //### (might take a long time to return) } -- cgit