Fix crash on resume in RunnableQueue

MozillaReality · Aug 2, 2019 · e66f75b · e66f75b
1 parent b8ccd64
commit e66f75b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/app/src/main/cpp/native-lib.cpp b/app/src/main/cpp/native-lib.cpp
@@ -198,7 +198,8 @@ android_main(android_app *aAppState) {
 
   // Attach JNI thread
   JNIEnv *jniEnv;
-  (*aAppState->activity->vm).AttachCurrentThread(&jniEnv, NULL);
+  (*aAppState->activity->vm).AttachCurrentThread(&jniEnv, nullptr);
+  sAppContext->mQueue->InitializeJava(jniEnv);
 
   // Create Browser context
   crow::VRBrowser::InitializeJava(jniEnv, aAppState->activity->clazz);
@@ -228,22 +229,26 @@ android_main(android_app *aAppState) {
     // Loop until all events are read
     // If the activity is paused use a blocking call to read events.
     while (ALooper_pollAll(BrowserWorld::Instance().IsPaused() ? -1 : 0,
-                           NULL,
+                           nullptr,
                            &events,
                            (void **) &pSource) >= 0) {
       // Process event.
       if (pSource) {
         pSource->process(aAppState, pSource);
       }
 
+
+
       // Check if we are exiting.
       if (aAppState->destroyRequested != 0) {
         sAppContext->mEgl->MakeCurrent();
+        sAppContext->mQueue->ProcessRunnables();
         BrowserWorld::Instance().ShutdownGL();
         BrowserWorld::Instance().ShutdownJava();
         BrowserWorld::Destroy();
         sAppContext->mEgl->Destroy();
-        sAppContext.reset();
+        sAppContext->mEgl.reset();
+        sAppContext->mDevice.reset();
         aAppState->activity->vm->DetachCurrentThread();
         return;
       }

diff --git a/app/src/main/cpp/vrb b/app/src/main/cpp/vrb