From e2bf5cad3e474104b6a7e92a55f4318314659bce Mon Sep 17 00:00:00 2001 From: David Rowe Date: Fri, 7 Aug 2015 11:59:11 -0700 Subject: [PATCH] Resume eye tracking at start-up if was running at shut-down --- interface/src/Application.cpp | 6 +++++- interface/src/devices/EyeTracker.h | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 992687d114..c9047e527f 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -2042,9 +2042,13 @@ void Application::setActiveFaceTracker() { void Application::setActiveEyeTracker() { #ifdef HAVE_IVIEWHMD + auto eyeTracker = DependencyManager::get(); + if (!eyeTracker->isInitialized()) { + return; + } + bool isEyeTracking = Menu::getInstance()->isOptionChecked(MenuOption::SMIEyeTracking); bool isSimulating = Menu::getInstance()->isOptionChecked(MenuOption::SimulateEyeTracking); - auto eyeTracker = DependencyManager::get(); eyeTracker->setEnabled(isEyeTracking, isSimulating); if (isEyeTracking && !eyeTracker->isTracking()) { Menu::getInstance()->setIsOptionChecked(MenuOption::SMIEyeTracking, false); diff --git a/interface/src/devices/EyeTracker.h b/interface/src/devices/EyeTracker.h index 3e602bb12d..8747076340 100644 --- a/interface/src/devices/EyeTracker.h +++ b/interface/src/devices/EyeTracker.h @@ -33,6 +33,7 @@ public: void setEnabled(bool enabled, bool simulate); void reset(); + bool isInitialized() const { return _isInitialized; } bool isTracking() const { return _isEnabled; } bool isSimulating() const { return _isSimulating; }