Skip to content
Merged
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 2 additions & 16 deletions src/packet_distribution.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,6 @@
#include "networkmanager.h"
#include "options.h"

#include <QJsonArray>
#include <QJsonDocument>
#include <QJsonObject>

void AOApplication::append_to_demofile(QString packet_string)
{
if (Options::getInstance().logToDemoFileEnabled() && !log_filename.isEmpty())
Expand Down Expand Up @@ -42,16 +38,6 @@ void AOApplication::server_packet_received(AOPacket packet)
}
#endif

auto convert_to_json = [](QString data) -> QJsonDocument {
QJsonParseError error;
QJsonDocument document = QJsonDocument::fromJson(data.toUtf8(), &error);
if (error.error != QJsonParseError::NoError)
{
qWarning().noquote() << "Invalid or malformed JSON data:" << error.errorString();
}
return document;
};

if (header == "decryptor")
{
if (content.size() == 0)
Expand Down Expand Up @@ -692,7 +678,7 @@ void AOApplication::server_packet_received(AOPacket packet)
}
else if (header == "PR")
{
if (content.size() < 2)
if (content.size() < 2 || !is_courtroom_constructed())
{
return;
}
Expand All @@ -702,7 +688,7 @@ void AOApplication::server_packet_received(AOPacket packet)
}
else if (header == "PU")
{
if (content.size() < 3)
if (content.size() < 3 || !is_courtroom_constructed())
{
return;
}
Expand Down