[Scummvm-cvs-logs] scummvm master -> 6476ba33d23135ace4550d6dc79f40e5f607386f

[somaen]

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:
6476ba33d2 WINTERMUTE: Fix double delete of TTFs.


Commit: 6476ba33d23135ace4550d6dc79f40e5f607386f
    https://github.com/scummvm/scummvm/commit/6476ba33d23135ace4550d6dc79f40e5f607386f
Author: Einar Johan Trøan Sømåen (einarjohants at gmail.com)
Date: 2013-01-22T16:40:13-08:00

Commit Message:
WINTERMUTE: Fix double delete of TTFs.

Changed paths:
    engines/wintermute/base/font/base_font_truetype.cpp



diff --git a/engines/wintermute/base/font/base_font_truetype.cpp b/engines/wintermute/base/font/base_font_truetype.cpp
index ce18594..83f0a35 100644
--- a/engines/wintermute/base/font/base_font_truetype.cpp
+++ b/engines/wintermute/base/font/base_font_truetype.cpp
@@ -560,7 +560,7 @@ bool BaseFontTT::initFont() {
 	if (file) {
 		_deletableFont = Graphics::loadTTFFont(*file, 96, _fontHeight); // Use the same dpi as WME (96 vs 72).
 		_font = _deletableFont;
-		delete file;
+		BaseFileManager::getEngineInstance()->closeFile(file);
 		file = NULL;
 	}
 
@@ -575,6 +575,7 @@ bool BaseFontTT::initFont() {
 				_deletableFont = Graphics::loadTTFFont(*file, 96, _fontHeight); // Use the same dpi as WME (96 vs 72).
 				_font = _deletableFont;
 			}
+			// We're not using BaseFileManager, so clean up after ourselves:
 			delete file;
 			file = NULL;
 			delete themeArchive;