Grab GUIChatConsole::m_font, fixes segfault when changing font_size

kahrl · Zeno- · commit 81b9c023c4f9 · 2015-02-18T00:38:57.000+10:00
diff --git a/src/guiChatConsole.cpp b/src/guiChatConsole.cpp
@@ -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)
 {

Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ GUIChatConsole::GUIChatConsole(`
`99`	`99`	`{`
`100`	`100`	`core::dimension2d<u32> dim = m_font->getDimension(L"M");`
`101`	`101`	`m_fontsize = v2u32(dim.Width, dim.Height);`
`102`		`- dstream << "Font size: " << m_fontsize.X << " " << m_fontsize.Y << std::endl;`
	`102`	`+ m_font->grab();`
`103`	`103`	`}`
`104`	`104`	`m_fontsize.X = MYMAX(m_fontsize.X, 1);`
`105`	`105`	`m_fontsize.Y = MYMAX(m_fontsize.Y, 1);`
`@@ -109,7 +109,10 @@ GUIChatConsole::GUIChatConsole(`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`GUIChatConsole::~GUIChatConsole()`
`112`		`-{}`
	`112`	`+{`
	`113`	`+ if (m_font)`
	`114`	`+ m_font->drop();`
	`115`	`+}`
`113`	`116`
`114`	`117`	`void GUIChatConsole::openConsole(f32 height)`
`115`	`118`	`{`