From e8f413c23669043e93e7ba1adb85911c55c457c5 Mon Sep 17 00:00:00 2001 From: David Skoland Date: Tue, 14 Feb 2017 09:58:05 +0100 Subject: fixed a crash relating to character selection --- packet_distribution.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'packet_distribution.cpp') diff --git a/packet_distribution.cpp b/packet_distribution.cpp index 239d079..3a9e786 100644 --- a/packet_distribution.cpp +++ b/packet_distribution.cpp @@ -344,6 +344,9 @@ void AOApplication::server_packet_received(AOPacket *p_packet) } else if (header == "CharsCheck") { + if (!courtroom_constructed) + goto end; + for (int n_char = 0 ; n_char < f_contents.size() ; ++n_char) { if (f_contents.at(n_char) == "-1") @@ -425,13 +428,10 @@ void AOApplication::server_packet_received(AOPacket *p_packet) if (!courtroom_constructed) goto end; - w_courtroom->set_char_select_page(); - - w_courtroom->append_ms_chatmessage(w_lobby->get_chatlog()); - - w_courtroom->set_mute_list(); + if (lobby_constructed) + w_courtroom->append_ms_chatmessage(w_lobby->get_chatlog()); - w_courtroom->show(); + w_courtroom->done_received(); destruct_lobby(); } -- cgit