From 9c76f379acb12246fb1e282661e67b9da4cdcb62 Mon Sep 17 00:00:00 2001
From: Kahrl <kahrl@gmx.net>
Date: Fri, 17 Jul 2015 08:51:07 +0200
Subject: [PATCH] Display an access denied message when client detects a server
timeout
---
src/client.cpp | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/src/client.cpp b/src/client.cpp
index 66aac6229..1bd8c39ae 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -743,14 +743,19 @@ bool Client::loadMedia(const std::string &data, const std::string &filename)
// Virtual methods from con::PeerHandler
void Client::peerAdded(con::Peer *peer)
{
- infostream<<"Client::peerAdded(): peer->id="
- <<peer->id<<std::endl;
+ infostream << "Client::peerAdded(): peer->id="
+ << peer->id << std::endl;
}
void Client::deletingPeer(con::Peer *peer, bool timeout)
{
- infostream<<"Client::deletingPeer(): "
+ infostream << "Client::deletingPeer(): "
"Server Peer is getting deleted "
- <<"(timeout="<<timeout<<")"<<std::endl;
+ << "(timeout=" << timeout << ")" << std::endl;
+
+ if (timeout) {
+ m_access_denied = true;
+ m_access_denied_reason = gettext("Connection timed out.");
+ }
}
/*
--
GitLab