Merge pull request #393 from skyedeving/fix-empty_sm_packet-crash

Add arup_clear() and clear arup when fetching new areas

2 files changed, 9 insertions, 0 deletions

diff --git a/include/courtroom.h b/include/courtroom.h
index cb1c4583..a4245a7d 100644
--- a/include/courtroom.h
+++ b/include/courtroom.h
@@ -92,6 +92,13 @@ public:
     arup_locks.append(locked);
   }
 
+  void arup_clear() {
+    arup_players.clear();
+    arup_statuses.clear();
+    arup_cms.clear();
+    arup_locks.clear();
+  }
+
   void arup_modify(int type, int place, QString value)
   {
     if (type == 0) {
diff --git a/src/packet_distribution.cpp b/src/packet_distribution.cpp
index 7146e6ed..15cb31b0 100644
--- a/src/packet_distribution.cpp
+++ b/src/packet_distribution.cpp
@@ -413,9 +413,11 @@ void AOApplication::server_packet_received(AOPacket *p_packet)
       goto end;
 
     w_courtroom->clear_areas();
+    w_courtroom->arup_clear();
 
     for (int n_element = 0; n_element < f_contents.size(); ++n_element) {
       w_courtroom->append_area(f_contents.at(n_element));
+      w_courtroom->arup_append(0, "Unknown", "Unknown", "Unknown");
     }
 
     w_courtroom->list_areas();