LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-20 12:40:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

love.graphics.setFont no longer explodes when passed a nonexistent file (fixes issue #177)

Browse Source
This commit is contained in:
Bill Meltsner
2011-02-02 21:07:21 -05:00
parent 64b6232c9a
commit e3e4ae17d8
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/opengl/wrap_Graphics.cpp
+6 -1
View File
@@ -452,7 +452,12 @@ namespace opengl
// Convert to Data, if necessary. // Convert to Data, if necessary.
if(luax_istype(L, 1, FILESYSTEM_FILE_T)) { if(luax_istype(L, 1, FILESYSTEM_FILE_T)) {
love::filesystem::File * f = luax_checktype<love::filesystem::File>(L, 1, "File", FILESYSTEM_FILE_T); love::filesystem::File * f = luax_checktype<love::filesystem::File>(L, 1, "File", FILESYSTEM_FILE_T);
Data * d = f->read(); Data * d;
try {
d = f->read();
} catch (love::Exception & e) {
return luaL_error(L, e.what());
}
lua_remove(L, 1); // get rid of the file lua_remove(L, 1); // get rid of the file
luax_newtype(L, "Data", DATA_T, (void*)d); luax_newtype(L, "Data", DATA_T, (void*)d);
lua_insert(L, 1); // put it at the bottom of the stack lua_insert(L, 1); // put it at the bottom of the stack