Commit 844c797d authored by nanahira's avatar nanahira

Merge branch 'master' into tcg_random

parents aaf10845 d2b964cb
...@@ -829,7 +829,7 @@ CLIENT_reconnect_register = global.CLIENT_reconnect_register = (client, room_id, ...@@ -829,7 +829,7 @@ CLIENT_reconnect_register = global.CLIENT_reconnect_register = (client, room_id,
} }
tmot = setTimeout(() -> tmot = setTimeout(() ->
room.disconnect(client, error) room.disconnect(client, error)
dinfo.old_server.destroy() #dinfo.old_server.destroy()
return return
, settings.modules.reconnect.wait_time) , settings.modules.reconnect.wait_time)
dinfo.timeout = tmot dinfo.timeout = tmot
......
...@@ -1073,7 +1073,6 @@ ...@@ -1073,7 +1073,6 @@
}; };
tmot = setTimeout(function() { tmot = setTimeout(function() {
room.disconnect(client, error); room.disconnect(client, error);
dinfo.old_server.destroy();
}, settings.modules.reconnect.wait_time); }, settings.modules.reconnect.wait_time);
dinfo.timeout = tmot; dinfo.timeout = tmot;
disconnect_list[CLIENT_get_authorize_key(client)] = dinfo; disconnect_list[CLIENT_get_authorize_key(client)] = dinfo;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment