MapleShrine/mkxp
1
0
Fork 0
Code Issues32 Pull requests11 Projects Releases Wiki Activity

Null deref fixes / cleanups

Browse source
This commit is contained in:
Jonas Kulla 2013-09-28 21:48:02 +02:00
parent 1737ec9af4
commit 2226927b08
3 changed files with 23 additions and 13 deletions

19
src/window.cpp
View file

@ -717,24 +717,29 @@ void Window::setWindowskin(Bitmap *value)
{
GUARD_DISPOSED;
if (value)
value->ensureNonMega();
p->windowskin = value;
if (!value)
return;
value->ensureNonMega();
}
void Window::setContents(Bitmap *value)
{
GUARD_DISPOSED;
if (value)
value->ensureNonMega();
if (p->contents == value)
return;
p->contents = value;
p->controlsVertDirty = true;
if (value)
p->contentsQuad.setTexPosRect(value->rect(), value->rect());
if (!value)
return;
value->ensureNonMega();
p->contentsQuad.setTexPosRect(value->rect(), value->rect());
}
void Window::setStretch(bool value)