diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 027ad159d0..b5b847ec16 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -2041,13 +2041,6 @@ void Application::setActiveFaceTracker() { #endif } -void Application::toggleFaceTrackerMute() { - FaceTracker* faceTracker = getSelectedFaceTracker(); - if (faceTracker) { - faceTracker->toggleMute(); - } -} - bool Application::exportEntities(const QString& filename, const QVector& entityIDs) { QVector entities; @@ -2480,7 +2473,13 @@ void Application::update(float deltaTime) { { PerformanceTimer perfTimer("devices"); DeviceTracker::updateAll(); - FaceTracker* tracker = getActiveFaceTracker(); + + FaceTracker* tracker = getSelectedFaceTracker(); + if (tracker && Menu::getInstance()->isOptionChecked(MenuOption::MuteFaceTracking) != tracker->isMuted()) { + tracker->toggleMute(); + } + + tracker = getActiveFaceTracker(); if (tracker && !tracker->isMuted()) { tracker->update(deltaTime); diff --git a/interface/src/Application.h b/interface/src/Application.h index 44ead54563..3b1f41dd73 100644 --- a/interface/src/Application.h +++ b/interface/src/Application.h @@ -426,7 +426,6 @@ public slots: void resetSensors(); void setActiveFaceTracker(); - void toggleFaceTrackerMute(); void aboutApp(); void showEditEntitiesHelp(); diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp index 8b14830c2d..d31110b344 100644 --- a/interface/src/Menu.cpp +++ b/interface/src/Menu.cpp @@ -435,8 +435,7 @@ Menu::Menu() { #if defined(HAVE_FACESHIFT) || defined(HAVE_DDE) faceTrackingMenu->addSeparator(); addCheckableActionToQMenuAndActionHash(faceTrackingMenu, MenuOption::MuteFaceTracking, - Qt::CTRL | Qt::SHIFT | Qt::Key_F, true, // DDE face tracking is on by default - qApp, SLOT(toggleFaceTrackerMute())); + Qt::CTRL | Qt::SHIFT | Qt::Key_F, true); // DDE face tracking is on by default addCheckableActionToQMenuAndActionHash(faceTrackingMenu, MenuOption::AutoMuteAudio, 0, false); #endif