Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-25 17:14:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #13367 from zfox23/MS15858_360SnapCrash

Browse source 
Fix MS15858: Prevent Interface deadlock during 360 Snap capture
This commit is contained in:
Zach Fox 2018-06-13 12:36:24 -07:00 committed by GitHub
commit ce0e66a7af
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
unpublishedScripts/marketplace/spectator-camera/SpectatorCamera.qml
View file

@ -205,7 +205,7 @@ Rectangle {
// Spectator Camera Preview
Hifi.ResourceImageItem {
id: spectatorCameraPreview;
visible: masterSwitch.checked;
visible: masterSwitch.checked && !root.processing360Snapshot;
url: showCameraView.checked || !HMD.active ? "resource://spectatorCameraFrame" : "resource://hmdPreviewFrame";
ready: masterSwitch.checked;
mirrorVertically: true;