Skip to content

Commit 3c2f68e

Browse files
committed
Check for vrDisplay presence before checking if presenting (fix #4110)
1 parent e335217 commit 3c2f68e

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -622,6 +622,7 @@ module.exports.AScene = registerElement('a-scene', {
622622

623623
this.addEventListener('loaded', function () {
624624
var renderer = this.renderer;
625+
var vrDisplay;
625626
var vrManager = this.renderer.vr;
626627
AEntity.prototype.play.call(this); // .play() *before* render.
627628

@@ -632,8 +633,9 @@ module.exports.AScene = registerElement('a-scene', {
632633
if (sceneEl.renderer) {
633634
if (window.performance) { window.performance.mark('render-started'); }
634635
loadingScreen.remove();
635-
if (utils.device.getVRDisplay().isPresenting) {
636-
vrManager.setDevice(utils.device.getVRDisplay());
636+
vrDisplay = utils.device.getVRDisplay();
637+
if (vrDisplay && vrDisplay.isPresenting) {
638+
vrManager.setDevice(vrDisplay);
637639
vrManager.enabled = true;
638640
sceneEl.enterVR();
639641
}

‎src/systems/gltf-model.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ module.exports.System = registerSystem('gltf-model', {
2121
},
2222

2323
update: function () {
24-
var path;
24+
var path;
2525
if (this.dracoLoader) { return; }
2626
path = this.data.dracoDecoderPath;
2727
THREE.DRACOLoader.setDecoderPath(path);

0 commit comments

Comments
 (0)