From 03df3df4b27d8b1002a31819e70b910d9305ae2e Mon Sep 17 00:00:00 2001 From: Gus Grubba Date: Thu, 27 Dec 2018 00:23:40 -0500 Subject: [PATCH] Handle video support along with overall Taisync support. --- src/Taisync/TaisyncManager.cc | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/Taisync/TaisyncManager.cc b/src/Taisync/TaisyncManager.cc index ba39d86..a729d33 100644 --- a/src/Taisync/TaisyncManager.cc +++ b/src/Taisync/TaisyncManager.cc @@ -98,9 +98,6 @@ TaisyncManager::_reset() connect(_appSettings->enableTaisyncVideo(), &Fact::rawValueChanged, this, &TaisyncManager::_setVideoEnabled); } _setEnabled(); - if(_enabled) { - _setVideoEnabled(); - } } //----------------------------------------------------------------------------- @@ -309,13 +306,15 @@ TaisyncManager::_setEnabled() _close(); } _enabled = enable; + //-- Now handle video support + _setVideoEnabled(); } //----------------------------------------------------------------------------- void TaisyncManager::_setVideoEnabled() { - bool enable = _appSettings->enableTaisyncVideo()->rawValue().toBool(); + bool enable = _appSettings->enableTaisyncVideo()->rawValue().toBool() && _appSettings->enableTaisync()->rawValue().toBool(); if(enable) { if(!_savedVideoSource.isValid()) { //-- Hide video selection as we will be fixed to Taisync video and set the way we need it.