Remove Android makefile ugly make -j hack

[minetest.git] / src / guiChatConsole.cpp

diff --git a/src/guiChatConsole.cpp b/src/guiChatConsole.cpp
index 19d9e3007e8a116cc3d266a52b0275296d00a815..b52589044ab018f7f2e7bef8d706f346cd05d223 100644 (file)
--- a/src/guiChatConsole.cpp
+++ b/src/guiChatConsole.cpp
@@ -26,11 +26,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "settings.h"
 #include "main.h"  // for g_settings
 #include "porting.h"
-#include "tile.h"
+#include "client/tile.h"
 #include "fontengine.h"
-#include <string>
-
+#include "log.h"
 #include "gettext.h"
+#include <string>
 
 #if USE_FREETYPE
 #include "xCGUITTFont.h"
@@ -99,7 +99,7 @@ GUIChatConsole::GUIChatConsole(
        {
                core::dimension2d<u32> dim = m_font->getDimension(L"M");
                m_fontsize = v2u32(dim.Width, dim.Height);
-               dstream << "Font size: " << m_fontsize.X << " " << m_fontsize.Y << std::endl;
+               m_font->grab();
        }
        m_fontsize.X = MYMAX(m_fontsize.X, 1);
        m_fontsize.Y = MYMAX(m_fontsize.Y, 1);
@@ -109,7 +109,10 @@ GUIChatConsole::GUIChatConsole(
 }
 
 GUIChatConsole::~GUIChatConsole()
-{}
+{
+       if (m_font)
+               m_font->drop();
+}
 
 void GUIChatConsole::openConsole(f32 height)
 {