From 2977ed86202e158ffe9effb66ff74965b4586f95 Mon Sep 17 00:00:00 2001
From: in1tiate <32779090+in1tiate@users.noreply.github.com>
Date: Mon, 21 Apr 2025 16:54:20 -0500
Subject: [PATCH] demo fixes (#1095)

- fix RD being recorded twice
- fix demos recording themselves
---
 src/packet_distribution.cpp | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/packet_distribution.cpp b/src/packet_distribution.cpp
index 4026675..6aa5036 100644
--- a/src/packet_distribution.cpp
+++ b/src/packet_distribution.cpp
@@ -9,6 +9,10 @@
 
 void AOApplication::append_to_demofile(QString packet_string)
 {
+  if (demo_server) // Currently playing a demo
+  {
+    return;
+  }
   if (Options::getInstance().logToDemoFileEnabled() && !log_filename.isEmpty())
   {
     QString path = log_filename.left(log_filename.size()).replace(".log", ".demo");
@@ -163,7 +167,7 @@ void AOApplication::server_packet_received(AOPacket packet)
 
     QString server_name_stripped = server_name;
     static QRegularExpression illegal_filename_chars("[\\\\/:*?\"<>|\']");
-    if (Options::getInstance().logToDemoFileEnabled() && server_name != "Demo playback")
+    if (Options::getInstance().logToDemoFileEnabled() && !demo_server)
     {
       this->log_filename = QDateTime::currentDateTime().toUTC().toString("'logs/" + server_name_stripped.remove(illegal_filename_chars) + "/'yyyy-MM-dd hh-mm-ss t'.log'");
       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)
 
     PlayerRegister update{content.at(0).toInt(), PlayerRegister::REGISTER_TYPE(content.at(1).toInt())};
     w_courtroom->playerList()->registerPlayer(update);
-
-    if (log_to_demo)
-    {
-      append_to_demofile(packet.toString(true));
-    }
   }
   else if (header == "PU")
   {