[Scummvm-cvs-logs] SF.net SVN: scummvm:[54256] scummvm/trunk/gui/ThemeEngine.cpp

[fingolfin at users.sourceforge.net]

Revision: 54256
          http://scummvm.svn.sourceforge.net/scummvm/?rev=54256&view=rev
Author:   fingolfin
Date:     2010-11-15 23:52:06 +0000 (Mon, 15 Nov 2010)

Log Message:
-----------
GUI: Fix bug in ThemeEngine::addFont related to localized fonts

Basically, it was remembering the font under its non-localized name.
This resulted in a leak, and potentially could have caused the wrong
font to be used in a localization.

Modified Paths:
--------------
    scummvm/trunk/gui/ThemeEngine.cpp

Modified: scummvm/trunk/gui/ThemeEngine.cpp
===================================================================
--- scummvm/trunk/gui/ThemeEngine.cpp	2010-11-15 23:51:46 UTC (rev 54255)
+++ scummvm/trunk/gui/ThemeEngine.cpp	2010-11-15 23:52:06 UTC (rev 54256)
@@ -575,7 +575,7 @@
 			_texts[textId]->_fontPtr = loadFont(localized);
 
 			if (_texts[textId]->_fontPtr)
-				FontMan.assignFontToName(file, _texts[textId]->_fontPtr);
+				FontMan.assignFontToName(localized, _texts[textId]->_fontPtr);
 
 			// Fallback to non-localized font and default translation
 			else {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.