minenux
/
minetest-engine-minetest
1
0
Fork 0
Code Pull Requests Releases Activity

Grab GUIChatConsole::m_font, fixes segfault when changing font_size

pull/2342/merge
Kahrl 2015-02-17 10:29:44 +01:00 committed by Craig Robbins
parent fd70f4f2f0
commit 81b9c023c4
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/guiChatConsole.cpp
View File

@ -99,7 +99,7 @@ GUIChatConsole::GUIChatConsole(
{ {
core::dimension2d<u32> dim = m_font->getDimension(L"M"); core::dimension2d<u32> dim = m_font->getDimension(L"M");
m_fontsize = v2u32(dim.Width, dim.Height); 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.X = MYMAX(m_fontsize.X, 1);
m_fontsize.Y = MYMAX(m_fontsize.Y, 1); m_fontsize.Y = MYMAX(m_fontsize.Y, 1);
@ -109,7 +109,10 @@ GUIChatConsole::GUIChatConsole(
} }
GUIChatConsole::~GUIChatConsole() GUIChatConsole::~GUIChatConsole()
{} {
if (m_font)
m_font->drop();
}
void GUIChatConsole::openConsole(f32 height) void GUIChatConsole::openConsole(f32 height)
{ {