From b5f237b58f4a98e4fee47081e26aa62a0a0f609c Mon Sep 17 00:00:00 2001
From: Lynix <lynix680@gmail.com>
Date: Sun, 24 Apr 2016 04:38:18 +0200
Subject: [PATCH] Fix some errors

Former-commit-id: df7db9ab69395ca969779817fcdc17acb711967d
---
 SDK/include/NDK/LuaAPI.inl  | 4 +++-
 src/Nazara/Utility/Font.cpp | 9 +++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/SDK/include/NDK/LuaAPI.inl b/SDK/include/NDK/LuaAPI.inl
index d80652780..1652d5719 100644
--- a/SDK/include/NDK/LuaAPI.inl
+++ b/SDK/include/NDK/LuaAPI.inl
@@ -8,6 +8,8 @@
 #include <Nazara/Math/Quaternion.hpp>
 #include <Nazara/Math/Vector3.hpp>
 #include <Nazara/Network/IpAddress.hpp>
+#include <Nazara/Utility/Font.hpp>
+#include <Nazara/Utility/Mesh.hpp>
 #include <NDK/Application.hpp>
 #include <NDK/Components.hpp>
 #include <NDK/Entity.hpp>
@@ -67,7 +69,7 @@ namespace Nz
 	inline unsigned int LuaImplQueryArg(const LuaInstance& instance, int index, FontRef* fontRef, TypeTag<FontRef>)
 	{
 		*fontRef = *(*static_cast<FontRef**>(instance.CheckUserdata(index, "Font")));
-		
+
 		return 1;
 	}
 
diff --git a/src/Nazara/Utility/Font.cpp b/src/Nazara/Utility/Font.cpp
index 9e26d28bb..a29d28671 100644
--- a/src/Nazara/Utility/Font.cpp
+++ b/src/Nazara/Utility/Font.cpp
@@ -359,13 +359,10 @@ namespace Nz
 		if (!s_defaultFont)
 		{
 			FontRef cabin = Font::New();
-			if (!cabin->OpenFromMemory(r_cabinRegular, sizeof(r_cabinRegular)))
-			{
+			if (cabin->OpenFromMemory(r_cabinRegular, sizeof(r_cabinRegular)))
+                s_defaultFont = cabin;
+			else
 				NazaraError("Failed to open default font");
-				return nullptr;
-			}
-
-			s_defaultFont = cabin;
 		}
 
 		return s_defaultFont;