Skip to content

Commit 2977ed8

Browse files
authored
demo fixes (#1095)
- fix RD being recorded twice - fix demos recording themselves
1 parent e34b875 commit 2977ed8

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

src/packet_distribution.cpp

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,10 @@
99

1010
void AOApplication::append_to_demofile(QString packet_string)
1111
{
12+
if (demo_server) // Currently playing a demo
13+
{
14+
return;
15+
}
1216
if (Options::getInstance().logToDemoFileEnabled() && !log_filename.isEmpty())
1317
{
1418
QString path = log_filename.left(log_filename.size()).replace(".log", ".demo");
@@ -163,7 +167,7 @@ void AOApplication::server_packet_received(AOPacket packet)
163167

164168
QString server_name_stripped = server_name;
165169
static QRegularExpression illegal_filename_chars("[\\\\/:*?\"<>|\']");
166-
if (Options::getInstance().logToDemoFileEnabled() && server_name != "Demo playback")
170+
if (Options::getInstance().logToDemoFileEnabled() && !demo_server)
167171
{
168172
this->log_filename = QDateTime::currentDateTime().toUTC().toString("'logs/" + server_name_stripped.remove(illegal_filename_chars) + "/'yyyy-MM-dd hh-mm-ss t'.log'");
169173
this->write_to_file("Joined server " + server_name_stripped + " hosted on address " + server_address + " on " + QDateTime::currentDateTime().toUTC().toString(), log_filename, true);
@@ -691,11 +695,6 @@ void AOApplication::server_packet_received(AOPacket packet)
691695

692696
PlayerRegister update{content.at(0).toInt(), PlayerRegister::REGISTER_TYPE(content.at(1).toInt())};
693697
w_courtroom->playerList()->registerPlayer(update);
694-
695-
if (log_to_demo)
696-
{
697-
append_to_demofile(packet.toString(true));
698-
}
699698
}
700699
else if (header == "PU")
701700
{

0 commit comments

Comments
 (0)