Fix several classes not accepting disposed bitmaps
Fixes an error in Alpha Kimori.
This commit is contained in:
parent
685f8b63b3
commit
11cfe887c2
|
@ -332,7 +332,7 @@ void Sprite::setBitmap(Bitmap *bitmap)
|
|||
|
||||
p->bitmap = bitmap;
|
||||
|
||||
if (!bitmap)
|
||||
if (nullOrDisposed(bitmap))
|
||||
return;
|
||||
|
||||
bitmap->ensureNonMega();
|
||||
|
|
|
@ -727,7 +727,7 @@ void Window::setWindowskin(Bitmap *value)
|
|||
|
||||
p->windowskin = value;
|
||||
|
||||
if (!value)
|
||||
if (nullOrDisposed(value))
|
||||
return;
|
||||
|
||||
value->ensureNonMega();
|
||||
|
@ -743,7 +743,7 @@ void Window::setContents(Bitmap *value)
|
|||
p->contents = value;
|
||||
p->controlsVertDirty = true;
|
||||
|
||||
if (!value)
|
||||
if (nullOrDisposed(value))
|
||||
return;
|
||||
|
||||
value->ensureNonMega();
|
||||
|
|
|
@ -921,6 +921,9 @@ void WindowVX::setContents(Bitmap *value)
|
|||
|
||||
p->contents = value;
|
||||
|
||||
if (nullOrDisposed(value))
|
||||
return;
|
||||
|
||||
FloatRect rect = p->contents->rect();
|
||||
p->contentsQuad.setTexPosRect(rect, rect);
|
||||
p->ctrlVertDirty = true;
|
||||
|
|
Loading…
Reference in New Issue