[android] set current scheduler on gl thread

1 files changed, 6 insertions, 0 deletions

diff --git a/platform/android/src/android_renderer_frontend.cpp b/platform/android/src/android_renderer_frontend.cpp
index 872fc4d57a..73cb0a817e 100644
--- a/platform/android/src/android_renderer_frontend.cpp
+++ b/platform/android/src/android_renderer_frontend.cpp
@@ -107,10 +107,16 @@ void AndroidRendererFrontend::render() {
     assert (renderer);
     if (!updateParameters) return;
 
+    // Activate the backend
     BackendScope backendGuard { *backend };
 
+    // Block the orchestration thread during render
     util::BlockingThreadGuard<Renderer> rendererGuard { *renderer };
 
+    // Ensure that the "current" scheduler on the render thread is
+    // actually the scheduler from the orchestration  thread
+    Scheduler::SetCurrent(renderer.get());
+
     if (framebufferSizeChanged) {
         backend->updateViewPort();
         framebufferSizeChanged = false;