From 42a49d356bf0cfac6a70569ad4b51073c87b95c2 Mon Sep 17 00:00:00 2001
From: "Randall E. Barker" <simstorm@mac.com>
Date: Wed, 10 Jul 2019 11:09:35 -0700
Subject: [PATCH] Fix controller state on Daydream devices.

On Daydream devices when the activity was paused, the controllers would get
disabled in BrowserWorld but not in the DeviceDelegate so when the activity
would resume, the controllers in the DeviceDelegate would never re-enable
the controller models in BrowserWorld.
---
 app/src/googlevr/cpp/DeviceDelegateGoogleVR.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/src/googlevr/cpp/DeviceDelegateGoogleVR.cpp b/app/src/googlevr/cpp/DeviceDelegateGoogleVR.cpp
index 22d86d52a..047dbaa12 100644
--- a/app/src/googlevr/cpp/DeviceDelegateGoogleVR.cpp
+++ b/app/src/googlevr/cpp/DeviceDelegateGoogleVR.cpp
@@ -589,6 +589,10 @@ DeviceDelegateGoogleVR::Pause() {
     VRB_LOG("Pause GVR tracking");
     GVR_CHECK(gvr_pause_tracking(m.gvr));
   }
+
+  for (Controller& controller: m.controllers) {
+    controller.enabled = false;
+  }
 }
 
 void