Skip to content

Commit 4b3a000

Browse files
authored
Merge pull request phaserjs#5559 from mattjennings/fix-5558
Fixes phaserjs#5558
2 parents 1d4e4e0 + 72fd48a commit 4b3a000

3 files changed

Lines changed: 19 additions & 8 deletions

File tree

src/display/mask/BitmapMask.js

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,10 @@ var BitmapMask = new Class({
146146

147147
scene.sys.game.events.on(GameEvents.CONTEXT_RESTORED, this.createMask, this);
148148

149-
renderer.on(RenderEvents.RESIZE, this.createMask, this);
149+
if (renderer)
150+
{
151+
renderer.on(RenderEvents.RESIZE, this.createMask, this);
152+
}
150153
},
151154

152155
/**
@@ -160,7 +163,7 @@ var BitmapMask = new Class({
160163
{
161164
var renderer = this.renderer;
162165

163-
if (!renderer.gl)
166+
if (!renderer || !renderer.gl)
164167
{
165168
return;
166169
}
@@ -197,7 +200,7 @@ var BitmapMask = new Class({
197200
{
198201
var renderer = this.renderer;
199202

200-
if (!renderer.gl || !this.mainTexture)
203+
if (!renderer || !renderer.gl || !this.mainTexture)
201204
{
202205
return;
203206
}
@@ -299,8 +302,11 @@ var BitmapMask = new Class({
299302
{
300303
this.clearMask();
301304

302-
this.renderer.off(RenderEvents.RESIZE, this.createMask, this);
303-
305+
if (this.renderer)
306+
{
307+
this.renderer.off(RenderEvents.RESIZE, this.createMask, this);
308+
}
309+
304310
this.bitmapMask = null;
305311
this.prevFramebuffer = null;
306312
this.renderer = null;

src/gameobjects/tilesprite/TileSprite.js

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -277,6 +277,11 @@ var TileSprite = new Class({
277277

278278
scene.sys.game.events.on(GameEvents.CONTEXT_RESTORED, function (renderer)
279279
{
280+
if (!renderer)
281+
{
282+
return;
283+
}
284+
280285
var gl = renderer.gl;
281286

282287
this.dirty = true;
@@ -429,7 +434,7 @@ var TileSprite = new Class({
429434
var fw = this.potWidth;
430435
var fh = this.potHeight;
431436

432-
if (!this.renderer.gl)
437+
if (!this.renderer || !this.renderer.gl)
433438
{
434439
fw = frame.cutWidth;
435440
fh = frame.cutHeight;
@@ -448,7 +453,7 @@ var TileSprite = new Class({
448453
fw, fh
449454
);
450455

451-
if (this.renderer.gl)
456+
if (this.renderer && this.renderer.gl)
452457
{
453458
this.fillPattern = this.renderer.canvasToTexture(canvas, this.fillPattern);
454459
}

src/textures/Texture.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -509,7 +509,7 @@ var Texture = new Class({
509509

510510
var renderer = this.manager.game.renderer;
511511

512-
if (renderer.type === CONST.WEBGL)
512+
if (renderer && renderer.type === CONST.WEBGL)
513513
{
514514
renderer.resetTextures(true);
515515
}

0 commit comments

Comments
 (0)