From 6a44e09f058cb1211406507df37508fcf1a7e126 Mon Sep 17 00:00:00 2001
From: Salanto <62221668+Salanto@users.noreply.github.com>
Date: Sat, 3 Aug 2024 11:39:29 +0200
Subject: [PATCH] Fix crash in demos due to PU not being recorded (#1032)

Added some guards due to bad demo files being shared by now
---
 src/packet_distribution.cpp      |  5 +++++
 src/widgets/playerlistwidget.cpp | 12 ++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/src/packet_distribution.cpp b/src/packet_distribution.cpp
index 6509900..6cf5c74 100644
--- a/src/packet_distribution.cpp
+++ b/src/packet_distribution.cpp
@@ -689,6 +689,11 @@ 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")
   {
diff --git a/src/widgets/playerlistwidget.cpp b/src/widgets/playerlistwidget.cpp
index 2a3a898..c72b74a 100644
--- a/src/widgets/playerlistwidget.cpp
+++ b/src/widgets/playerlistwidget.cpp
@@ -139,6 +139,11 @@ void PlayerListWidget::filterPlayerList()
   int area_id = m_player_map.value(ao_app->client_id).area_id;
   for (QListWidgetItem *item : qAsConst(m_item_map))
   {
+    if (!item)
+    {
+      qWarning() << "Trying to filter item that does not exist. This indicates either a broken server-implementation or a bad demo file.";
+      break;
+    }
     item->setHidden(m_player_map[item->data(Qt::UserRole).toInt()].area_id != area_id);
   }
 }
@@ -147,6 +152,13 @@ void PlayerListWidget::updatePlayer(int playerId, bool updateIcon)
 {
   PlayerData &data = m_player_map[playerId];
   QListWidgetItem *item = m_item_map[playerId];
+
+  if (!item)
+  {
+    qWarning() << "No player at ID" << playerId << ". This might indicate a broker server implementation or a bad demo file.";
+    return;
+  }
+
   item->setText(data.name.isEmpty() ? QObject::tr("Unnamed Player") : data.name);
   if (data.character.isEmpty())
   {