Browse Source

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

Bill Meltsner 14 years ago
parent
commit
e3e4ae17d8
1 changed files with 6 additions and 1 deletions
  1. 6 1
      src/modules/graphics/opengl/wrap_Graphics.cpp

+ 6 - 1
src/modules/graphics/opengl/wrap_Graphics.cpp

@@ -452,7 +452,12 @@ namespace opengl
 			// Convert to Data, if necessary.
 			if(luax_istype(L, 1, 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
 				luax_newtype(L, "Data", DATA_T, (void*)d);
 				lua_insert(L, 1); // put it at the bottom of the stack