aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authororwell96 <mono96.mml@gmail.com>2016-03-11 18:41:56 +0100
committerest31 <MTest31@outlook.com>2016-03-11 23:43:37 +0100
commit0d2df732e5c5075cd8848b9a9530865430630bfe (patch)
tree793ade5c17d646095105945c9ecab120040afb7b
parent6f325070dde739ab942286bd6e368930ea41cb42 (diff)
downloadminetest-0d2df732e5c5075cd8848b9a9530865430630bfe.tar.gz
minetest-0d2df732e5c5075cd8848b9a9530865430630bfe.tar.bz2
minetest-0d2df732e5c5075cd8848b9a9530865430630bfe.zip
Fix ask_reconnect_on_crash option being ignored
Since commit 3b50b2766aeb09c9fc0ad0ea07426bb2187df3d7 "Optional reconnect functionality" there is a config option named ask_reconnect_on_crash. It asks the client to reconnect to the server if the server crashed. It has been implemeted and works, but due to a function parameter not being passed it never showed effect. This patch adds the parameter and fixes the bug. Also fixes the `reconnect` option of minetest.request_shutdown being ignored.
-rw-r--r--src/server.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server.cpp b/src/server.cpp
index 75ca7448f..2fa8c4cf8 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -2568,7 +2568,7 @@ void Server::DenyAccessVerCompliant(u16 peer_id, u16 proto_ver, AccessDeniedCode
const std::string &str_reason, bool reconnect)
{
if (proto_ver >= 25) {
- SendAccessDenied(peer_id, reason, str_reason);
+ SendAccessDenied(peer_id, reason, str_reason, reconnect);
} else {
std::wstring wreason = utf8_to_wide(
reason == SERVER_ACCESSDENIED_CUSTOM_STRING ? str_reason :