Hot-Fix: Crash in ControllerManager::updateStateAndPredict when xbox …

…360 controller is connected * Need to skip optical update for PSNavi controller views
psmoveservice · Oct 25, 2018 · 740161c · 740161c
1 parent 937e29a
commit 740161c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/psmoveprotocol/ProtocolVersion.h b/src/psmoveprotocol/ProtocolVersion.h
@@ -14,7 +14,7 @@
 #define PSM_RELEASE_VERSION_PHASE   alpha
 #define PSM_RELEASE_VERSION_MINOR   9
 #define PSM_RELEASE_VERSION_RELEASE 0
-#define PSM_RELEASE_VERSION_HOTFIX  0
+#define PSM_RELEASE_VERSION_HOTFIX  1
 
 /// "Product.Major-Phase Minor.Release.Hotfix"
 #if !defined(PSM_RELEASE_VERSION_STRING)

diff --git a/src/psmoveservice/Device/Manager/ControllerManager.cpp b/src/psmoveservice/Device/Manager/ControllerManager.cpp
@@ -130,6 +130,7 @@ ControllerManager::updateStateAndPredict(TrackerManager* tracker_manager)
 		ServerControllerViewPtr controllerView = getControllerViewPtr(device_id);
 
 		if (controllerView->getIsOpen() && 
+			controllerView->getControllerDeviceType() != CommonDeviceState::PSNavi &&
             (controllerView->getIsBluetooth() || controllerView->getIsVirtualController()))
 		{
 			controllerView->updateOpticalPoseEstimation(tracker_manager);