Skip to content

Commit 2ec1367

Browse files
committed
fix disconnect crash
1 parent 9e73b9e commit 2ec1367

1 file changed

Lines changed: 8 additions & 9 deletions

File tree

server/sm64net.py

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,10 @@ def __init__(self, tcp, udp, addr):
5959
def write_udp(self, data):
6060
self.s_udp.sendto(data, (self.s_addr, NET_PORT))
6161
def write_tcp(self, data):
62-
self.s_tcp.sendall(data)
62+
try:
63+
self.s_tcp.sendall(data)
64+
except:
65+
pass
6366
def write_mem(self, addr, data):
6467
header = struct.pack(">iII", -2, addr, len(data))
6568
self.write_tcp(header + (0x100-len(header))*B"\x00" + data)
@@ -126,14 +129,10 @@ def cmd_touch(self, data):
126129

127130
def update_connect(self):
128131
self.write_tcp(struct.pack(">I59s1x", np_table, VERSION.encode()))
129-
try:
130-
self.nff_write_file("dab.nff")
131-
self.nff_write_file("print_font.nff")
132-
self.nff_write_file("build/main.nff")
133-
self.sync(False, True)
134-
# connection rejected
135-
except:
136-
pass
132+
self.nff_write_file("dab.nff")
133+
self.nff_write_file("print_font.nff")
134+
self.nff_write_file("build/main.nff")
135+
self.sync(False, True)
137136
def update_tcp(self, data):
138137
cmd, = struct.unpack(">I", data[:4])
139138
if cmd in self.cmd_table:

0 commit comments

Comments
 (0)