From 0ce11ee2b174df0904d73fb7b09796fb117e6b3c Mon Sep 17 00:00:00 2001
From: MysterD <myster@d>
Date: Wed, 11 Aug 2021 00:19:47 -0700
Subject: [PATCH] Prevent main menu player model from corrupting while joining

---
 src/pc/djui/djui.c                        | 1 +
 src/pc/network/network.c                  | 2 --
 src/pc/network/packets/packet_save_file.c | 1 +
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pc/djui/djui.c b/src/pc/djui/djui.c
index 0a030c770..fd5c11447 100644
--- a/src/pc/djui/djui.c
+++ b/src/pc/djui/djui.c
@@ -29,6 +29,7 @@ void djui_init(void) {
 
 void djui_connect_menu_open(void) {
     djui_panel_shutdown();
+    gDjuiInMainMenu = true;
     djui_panel_main_create(NULL);
     djui_panel_join_create(NULL);
     djui_panel_join_message_create(NULL);
diff --git a/src/pc/network/network.c b/src/pc/network/network.c
index 04e7ce306..f7787664b 100644
--- a/src/pc/network/network.c
+++ b/src/pc/network/network.c
@@ -86,8 +86,6 @@ bool network_init(enum NetworkType inNetworkType) {
         gOverrideEeprom = NULL;
 
         djui_chat_box_create();
-    } else if (gNetworkType == NT_CLIENT) {
-        network_player_connected(NPT_SERVER, 0, 0, 0, "Player");
     }
 
     LOG_INFO("initialized");
diff --git a/src/pc/network/packets/packet_save_file.c b/src/pc/network/packets/packet_save_file.c
index 9e3762274..8b63f00f1 100644
--- a/src/pc/network/packets/packet_save_file.c
+++ b/src/pc/network/packets/packet_save_file.c
@@ -3,6 +3,7 @@
 #include "game/save_file.h"
 
 void network_send_save_file(s32 fileIndex) {
+    if (gNetworkPlayerServer == NULL) { return; }
     assert(gNetworkType == NT_CLIENT);
     struct Packet p;
     packet_init(&p, PACKET_SAVE_FILE, true, false);