Ancurio/mkxp-freebird
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix several classes not accepting disposed bitmaps

Browse source 
Fixes an error in Alpha Kimori.
This commit is contained in:
Jonas Kulla 2014-12-22 08:22:45 +01:00
parent 685f8b63b3
commit 11cfe887c2
3 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/sprite.cpp
View file

@ -332,7 +332,7 @@ void Sprite::setBitmap(Bitmap *bitmap)
p->bitmap = bitmap; p->bitmap = bitmap;
if (!bitmap) if (nullOrDisposed(bitmap))
return; return;
bitmap->ensureNonMega(); bitmap->ensureNonMega();

4
src/window.cpp
View file

@ -727,7 +727,7 @@ void Window::setWindowskin(Bitmap *value)
p->windowskin = value; p->windowskin = value;
if (!value) if (nullOrDisposed(value))
return; return;
value->ensureNonMega(); value->ensureNonMega();
@ -743,7 +743,7 @@ void Window::setContents(Bitmap *value)
p->contents = value; p->contents = value;
p->controlsVertDirty = true; p->controlsVertDirty = true;
if (!value) if (nullOrDisposed(value))
return; return;
value->ensureNonMega(); value->ensureNonMega();

3
src/windowvx.cpp
View file

@ -921,6 +921,9 @@ void WindowVX::setContents(Bitmap *value)
p->contents = value; p->contents = value;
if (nullOrDisposed(value))
return;
FloatRect rect = p->contents->rect(); FloatRect rect = p->contents->rect();
p->contentsQuad.setTexPosRect(rect, rect); p->contentsQuad.setTexPosRect(rect, rect);
p->ctrlVertDirty = true; p->ctrlVertDirty = true;