From 5092e385b10b0ab16d9cabe4eb64fde8bb8166ca Mon Sep 17 00:00:00 2001 From: David Rowe Date: Fri, 8 May 2015 18:39:22 -0700 Subject: [PATCH] Disable "calibrate" menu item if webcam isn't enabled --- interface/src/Application.cpp | 1 + interface/src/devices/DdeFaceTracker.cpp | 1 + 2 files changed, 2 insertions(+) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index cc62490b64..bae191804b 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -948,6 +948,7 @@ void Application::faceTrackerMuteToggled() { bool isMuted = getSelectedFaceTracker()->isMuted(); muteAction->setChecked(isMuted); getSelectedFaceTracker()->setEnabled(!isMuted); + Menu::getInstance()->getActionForOption(MenuOption::CalibrateCamera)->setEnabled(!isMuted); } void Application::aboutApp() { diff --git a/interface/src/devices/DdeFaceTracker.cpp b/interface/src/devices/DdeFaceTracker.cpp index b5a2d93125..2ff4509e89 100644 --- a/interface/src/devices/DdeFaceTracker.cpp +++ b/interface/src/devices/DdeFaceTracker.cpp @@ -219,6 +219,7 @@ DdeFaceTracker::~DdeFaceTracker() { void DdeFaceTracker::init() { FaceTracker::init(); setEnabled(Menu::getInstance()->isOptionChecked(MenuOption::UseCamera) && !_isMuted); + Menu::getInstance()->getActionForOption(MenuOption::CalibrateCamera)->setEnabled(!_isMuted); } void DdeFaceTracker::setEnabled(bool enabled) {