Null deref fixes / cleanups

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

View file

@ -152,10 +152,13 @@ void Sprite::setBitmap(Bitmap *bitmap)
if (p->bitmap == bitmap)
return;
if (bitmap)
bitmap->ensureNonMega();
p->bitmap = bitmap;
if (!bitmap)
return;
bitmap->ensureNonMega();
*p->srcRect = bitmap->rect();
p->onSrcRectChange();
p->quad.setPosRect(p->srcRect->toFloatRect());