Extex101
/
minetest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix crash caused by null texture in GUI formspec/HUD.

master
Aaron Suen 2015-04-02 08:58:18 -04:00 committed by Craig Robbins
parent 58d62ad045
commit 92f20696eb
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/guiscalingfilter.cpp
View File

@ -72,7 +72,8 @@ video::ITexture *guiScalingResizeCached(video::IVideoDriver *driver,
video::ITexture *src, const core::rect<s32> &srcrect, video::ITexture *src, const core::rect<s32> &srcrect,
const core::rect<s32> &destrect) const core::rect<s32> &destrect)
{ {
if (src == NULL)
return src;
if (!g_settings->getBool("gui_scaling_filter")) if (!g_settings->getBool("gui_scaling_filter"))
return src; return src;
@ -139,6 +140,8 @@ video::ITexture *guiScalingResizeCached(video::IVideoDriver *driver,
video::ITexture *guiScalingImageButton(video::IVideoDriver *driver, video::ITexture *guiScalingImageButton(video::IVideoDriver *driver,
video::ITexture *src, s32 width, s32 height) video::ITexture *src, s32 width, s32 height)
{ {
if (src == NULL)
return src;
return guiScalingResizeCached(driver, src, return guiScalingResizeCached(driver, src,
core::rect<s32>(0, 0, src->getSize().Width, src->getSize().Height), core::rect<s32>(0, 0, src->getSize().Width, src->getSize().Height),
core::rect<s32>(0, 0, width, height)); core::rect<s32>(0, 0, width, height));
@ -154,6 +157,8 @@ void draw2DImageFilterScaled(video::IVideoDriver *driver, video::ITexture *txr,
{ {
// Attempt to pre-scale image in software in high quality. // Attempt to pre-scale image in software in high quality.
video::ITexture *scaled = guiScalingResizeCached(driver, txr, srcrect, destrect); video::ITexture *scaled = guiScalingResizeCached(driver, txr, srcrect, destrect);
if (scaled == NULL)
return;
// Correct source rect based on scaled image. // Correct source rect based on scaled image.
const core::rect<s32> mysrcrect = (scaled != txr) const core::rect<s32> mysrcrect = (scaled != txr)