From 744da710a313a18ad80fe16b5cd0b79f5a093ab4 Mon Sep 17 00:00:00 2001 From: Alexander Ivash Date: Tue, 16 Jan 2018 01:41:23 +0300 Subject: [PATCH] move VSYNC into 'PreviewDisabledReasons' enum --- libraries/ui/src/DesktopPreviewProvider.cpp | 4 ++++ libraries/ui/src/DesktopPreviewProvider.h | 5 ++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libraries/ui/src/DesktopPreviewProvider.cpp b/libraries/ui/src/DesktopPreviewProvider.cpp index 4eeb058a57..92a8d9e055 100644 --- a/libraries/ui/src/DesktopPreviewProvider.cpp +++ b/libraries/ui/src/DesktopPreviewProvider.cpp @@ -27,6 +27,10 @@ QImage DesktopPreviewProvider::getPreviewDisabledImage(bool vsyncEnabled) const } void DesktopPreviewProvider::setPreviewDisabledReason(PreviewDisabledReasons reason) { + if (reason == VSYNC) { + return; // Not settable via this interface, as VSYNC is controlled by HMD plugin.. + } + m_previewDisabledReason = reason; } diff --git a/libraries/ui/src/DesktopPreviewProvider.h b/libraries/ui/src/DesktopPreviewProvider.h index 2204f26378..40a4640f85 100644 --- a/libraries/ui/src/DesktopPreviewProvider.h +++ b/libraries/ui/src/DesktopPreviewProvider.h @@ -18,12 +18,11 @@ class DesktopPreviewProvider : public QObject, public Dependency { public: enum PreviewDisabledReasons { USER = 0, - SECURE_SCREEN + SECURE_SCREEN, + VSYNC // Not settable via this interface, as VSYNC is controlled by HMD plugin.. }; Q_ENUM(PreviewDisabledReasons) - int VSYNC { 2 }; - static QSharedPointer DesktopPreviewProvider::getInstance(); QImage getPreviewDisabledImage(bool vsyncEnabled) const;