Skip to content

Commit 637bb48

Browse files
committed
Guard against a null camera when entering VR
1 parent df63e7f commit 637bb48

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

‎src/core/scene/a-scene.js‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -248,6 +248,10 @@ module.exports.AScene = registerElement('a-scene', {
248248
if (this.is('vr-mode')) { return Promise.resolve('Already in VR.'); }
249249
// Enter VR via WebVR API.
250250
if (!fromExternal && (this.checkHeadsetConnected() || this.isMobile)) {
251+
if (!this.camera) {
252+
// Attempted to enter VR before the camera was initialized. Aborting silently.
253+
return Promise.resolve();
254+
}
251255
vrDisplay = utils.device.getVRDisplay();
252256
vrManager.setDevice(vrDisplay);
253257
vrManager.enabled = true;

0 commit comments

Comments
 (0)