From 0c64d1227a5c7c57eca72dec9c027b039df0564c Mon Sep 17 00:00:00 2001
From: SamGondelman <samuel@highfidelity.io>
Date: Tue, 4 Dec 2018 16:41:03 -0800
Subject: [PATCH 1/2] fix vive crash

---
 plugins/openvr/src/OpenVrDisplayPlugin.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/openvr/src/OpenVrDisplayPlugin.cpp b/plugins/openvr/src/OpenVrDisplayPlugin.cpp
index 99c861871d..62f1720814 100644
--- a/plugins/openvr/src/OpenVrDisplayPlugin.cpp
+++ b/plugins/openvr/src/OpenVrDisplayPlugin.cpp
@@ -485,6 +485,7 @@ bool OpenVrDisplayPlugin::internalActivate() {
                 _submitCanvas->doneCurrent();
             });
         }
+        _submitCanvas->moveToThread(_submitThread.get());
     }
 
     return Parent::internalActivate();

From 58396b845fc4a9733d9d0bb43d6bbb3d72a15336 Mon Sep 17 00:00:00 2001
From: SamGondelman <samuel@highfidelity.io>
Date: Tue, 4 Dec 2018 17:32:50 -0800
Subject: [PATCH 2/2] move back to plugin thread

(cherry picked from commit 98d3f6a9d1191031cda1ff040e69093ef6824f1c)
---
 plugins/openvr/src/OpenVrDisplayPlugin.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/plugins/openvr/src/OpenVrDisplayPlugin.cpp b/plugins/openvr/src/OpenVrDisplayPlugin.cpp
index 62f1720814..11ef222172 100644
--- a/plugins/openvr/src/OpenVrDisplayPlugin.cpp
+++ b/plugins/openvr/src/OpenVrDisplayPlugin.cpp
@@ -319,6 +319,7 @@ public:
         glBindVertexArray(0);
         glDeleteVertexArrays(1, &_vao);
         _canvas->doneCurrent();
+        _canvas->moveToThread(_plugin.thread());
     }
 
     void update(const CompositeInfo& newCompositeInfo) { _queue.push(newCompositeInfo); }