From 1d96a615b5d1578912ec2e95c03dee6781cb3396 Mon Sep 17 00:00:00 2001
From: Tiger Wang <ziwei.tiger@hotmail.co.uk>
Date: Tue, 7 Jan 2014 16:53:40 +0000
Subject: Fixed favicons

---
 src/Server.cpp | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

(limited to 'src/Server.cpp')

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
-- 
cgit v1.2.3