From 8283a5bdda509c338cab8fb38d4f2111c90e23fc Mon Sep 17 00:00:00 2001
From: AJ Kelly <aj187@ajworld.net>
Date: Thu, 17 Feb 2011 15:00:58 -0600
Subject: [PATCH] font reloading for real this time

---
 src/Font.cpp        | 7 ++++---
 src/FontManager.cpp | 4 +---
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/Font.cpp b/src/Font.cpp
index 049b8f137d..ca95e58605 100644
--- a/src/Font.cpp
+++ b/src/Font.cpp
@@ -726,9 +726,10 @@ void Font::Load( const RString &sIniPath, RString sChars )
 				continue;
 			}
 
-			Font *subfont=FONT->LoadFont(path,"");
-			MergeFont(*subfont);
-			FONT->UnloadFont(subfont);
+			Font subfont;
+			subfont.Load(path,"");
+			MergeFont(subfont);
+			//FONT->UnloadFont(subfont);
 		}
 	}
 
diff --git a/src/FontManager.cpp b/src/FontManager.cpp
index 5aba61bad2..243c06adbc 100644
--- a/src/FontManager.cpp
+++ b/src/FontManager.cpp
@@ -54,8 +54,7 @@ Font* FontManager::LoadFont( const RString &sFontOrTextureFilePath, RString sCha
 	if( p != g_mapPathToFont.end() )
 	{
 		pFont=p->second;
-		// reload in case metrics may have changed
-		pFont->Load(sFontOrTextureFilePath, sChars);
+		pFont->m_iRefCount++;
 	}
 	else {
 		pFont= new Font;
@@ -63,7 +62,6 @@ Font* FontManager::LoadFont( const RString &sFontOrTextureFilePath, RString sCha
 		g_mapPathToFont[NewName] = pFont;
 	}
 
-	pFont->m_iRefCount++;
 	return pFont;
 }