4 files changed, 8 insertions, 18 deletions

diff --git a/src/Protocol/Protocol17x.cpp b/src/Protocol/Protocol17x.cpp
index 5947415dd..8ec5dec29 100644
--- a/src/Protocol/Protocol17x.cpp
+++ b/src/Protocol/Protocol17x.cpp
@@ -1112,7 +1112,7 @@ void cProtocol172::HandlePacketStatusRequest(cByteBuffer & a_ByteBuffer)
 		cRoot::Get()->GetServer()->GetMaxPlayers(),
 		cRoot::Get()->GetServer()->GetNumPlayers()
 	);
-	AppendPrintf(Response, "\"description\":{\"text\":\"%s\"}",
+	AppendPrintf(Response, "\"description\":{\"text\":\"%s\"},",
 		cRoot::Get()->GetServer()->GetDescription().c_str()
 	);
 	AppendPrintf(Response, "\"favicon\":\"data:image/png;base64,%s\"",
diff --git a/src/Server.cpp b/src/Server.cpp
index b0439391c..49067c17f 100644
--- a/src/Server.cpp
+++ b/src/Server.cpp
@@ -203,10 +203,7 @@ bool cServer::InitServer(cIniFile & a_SettingsIni)
 	m_PlayerCount = 0;
 	m_PlayerCountDiff = 0;
 
-	if (cFile::Exists("favicon.png"))
-	{
-		m_FaviconData = Base64Encode(cFile::ReadWholeFile("favicon.png"));
-	}
+	m_FaviconData = Base64Encode(cFile::ReadWholeFile("favicon.png")); // Will return empty string if file nonexistant; client doesn't mind
 
 	if (m_bIsConnected)
 	{
@@ -294,15 +291,6 @@ int cServer::GetNumPlayers(void)
 
 
 
-const AString & cServer::GetFaviconData(void) const
-{
-	return m_FaviconData;
-}
-
-
-
-
-
 void cServer::PrepareKeys(void)
 {
 	// TODO: Save and load key for persistence across sessions
diff --git a/src/Server.h b/src/Server.h
index 2609b6874..d79417fb0 100644
--- a/src/Server.h
+++ b/src/Server.h
@@ -107,7 +107,8 @@ public:												// tolua_export
 	/// Notifies the server that a player is being destroyed; the server uses this to adjust the number of players
 	void PlayerDestroying(const cPlayer * a_Player);
 
-	const AString & GetFaviconData(void) const;
+	/* Returns base64 encoded favicon data (obtained from favicon.png) */
+	const AString & GetFaviconData(void) const { return m_FaviconData; }
 	
 	CryptoPP::RSA::PrivateKey & GetPrivateKey(void) { return m_PrivateKey; }
 	CryptoPP::RSA::PublicKey  & GetPublicKey (void) { return m_PublicKey; }
diff --git a/src/StringUtils.cpp b/src/StringUtils.cpp
index e6deb0705..5d16616c5 100644
--- a/src/StringUtils.cpp
+++ b/src/StringUtils.cpp
@@ -759,7 +759,8 @@ AString Base64Decode(const AString & a_Base64String)
 		}
 	}
 	res.resize(o >> 3);
-	return res;}
+	return res;
+}
 
 
 
@@ -774,7 +775,7 @@ AString Base64Encode(const AString & a_Input)
 		'w','x','y','z','0','1','2','3','4','5','6','7','8','9','+','/'
 	};
 
-	std::string output;
+	AString output;
 	output.resize(((a_Input.size() + 2) / 3) * 4);
 
 	size_t output_index = 0;
@@ -804,7 +805,7 @@ AString Base64Encode(const AString & a_Input)
 
 		output[output_index++] = '=';
 	}
-	assert(output_index == output.size());
+	ASSERT(output_index == output.size());
 
 	return output;
 }