[Scummvm-cvs-logs] scummvm master -> 47edab71e87e46a6ee4b1e9801cfc482ae9c764e
lordhoto
lordhoto at gmail.com
Fri Jan 6 22:28:36 CET 2012
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
47edab71e8 GUI: Do an case-insensitive filename comparison.
Commit: 47edab71e87e46a6ee4b1e9801cfc482ae9c764e
https://github.com/scummvm/scummvm/commit/47edab71e87e46a6ee4b1e9801cfc482ae9c764e
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2012-01-06T13:27:26-08:00
Commit Message:
GUI: Do an case-insensitive filename comparison.
Should be a bit safer, in case there's files with different cases, which match
by chance.
Changed paths:
gui/ThemeEngine.cpp
diff --git a/gui/ThemeEngine.cpp b/gui/ThemeEngine.cpp
index 2f84fae..7678efb 100644
--- a/gui/ThemeEngine.cpp
+++ b/gui/ThemeEngine.cpp
@@ -1412,7 +1412,7 @@ const Graphics::Font *ThemeEngine::loadFont(const Common::String &filename) {
for (Common::ArchiveMemberList::const_iterator i = members.begin(), end = members.end(); i != end; ++i) {
Common::SeekableReadStream *stream = (*i)->createReadStream();
if (stream) {
- if ((*i)->getName() == cacheFilename) {
+ if ((*i)->getName().equalsIgnoreCase(cacheFilename)) {
font = Graphics::BdfFont::loadFromCache(*stream);
} else {
font = Graphics::BdfFont::loadFont(*stream);
More information about the Scummvm-git-logs
mailing list