[Scummvm-git-logs] scummvm master -> 1caaf49f20ebbe44c8fb116144fca1f85ae1bae3

[sev-]

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:
1caaf49f20 GRAPHICS: Gracefully process previous version of classicmacfonts.dat


Commit: 1caaf49f20ebbe44c8fb116144fca1f85ae1bae3
    https://github.com/scummvm/scummvm/commit/1caaf49f20ebbe44c8fb116144fca1f85ae1bae3
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-01-23T19:59:42+01:00

Commit Message:
GRAPHICS: Gracefully process previous version of classicmacfonts.dat

Changed paths:
    graphics/macgui/macfontmanager.cpp


diff --git a/graphics/macgui/macfontmanager.cpp b/graphics/macgui/macfontmanager.cpp
index 836255a..d49f17c 100644
--- a/graphics/macgui/macfontmanager.cpp
+++ b/graphics/macgui/macfontmanager.cpp
@@ -161,7 +161,7 @@ void MacFontManager::loadFonts() {
 		Common::MacResManager *fontFile = new Common::MacResManager();
 
 		if (!fontFile->loadFromMacBinary(*stream))
-			error("Could not open %s as a resource fork", (*it)->getName().c_str());
+			continue;
 
 		Common::MacResIDArray fonds = fontFile->getResIDArray(MKTAG('F','O','N','D'));
 		if (fonds.size() > 0) {