fix teapot random crash

ggfan · ggfan · commit 2b8606e7d2f9 · 2015-09-01T16:41:23.000-07:00
diff --git a/samples-android/ButtonClicker/jni/Application.mk b/samples-android/ButtonClicker/jni/Application.mk
@@ -1,8 +1,5 @@
 APP_PLATFORM := android-22
-#APP_ABI := all
-#APP_ABI := armeabi-v7a
-APP_STL := arm64-v8a
-
+APP_ABI := armeabi-v7a
 APP_STL := c++_static
 
 APP_CPPFLAGS := -std=c++11
diff --git a/samples-android/ButtonClicker/jni/ButtonClickerNativeActivity.cpp b/samples-android/ButtonClicker/jni/ButtonClickerNativeActivity.cpp
@@ -105,7 +105,10 @@ void Engine::InitGooglePlayGameServices() {
  *
  */
 void Engine::OnAuthActionStarted(gpg::AuthOperation op) {
-  startup_mutex_.lock();
+  if(!initialized_resources_) {
+    return;
+  }
+
   ndk_helper::JNIHelper::GetInstance()->RunOnUiThread([this, op]() {
     EnableUI(false);
     if (op == gpg::AuthOperation::SIGN_IN) {
@@ -133,14 +136,17 @@ void Engine::OnAuthActionFinished(gpg::AuthOperation op,
     });
   }
 
+  if(!initialized_resources_) {
+    return;
+  }
+
   ndk_helper::JNIHelper::GetInstance()->RunOnUiThread([this, status]() {
     EnableUI(true);
     button_sign_in_->SetAttribute(
         "Text", gpg::IsSuccess(status) ? "Sign Out" : "Sign In");
 
     status_text_->SetAttribute(
         "Text", gpg::IsSuccess(status) ? "Signed In" : "Signed Out");
-    startup_mutex_.unlock();
   });
 }
 
diff --git a/samples-android/ButtonClicker/jni/ButtonClickerNativeActivity.h b/samples-android/ButtonClicker/jni/ButtonClickerNativeActivity.h
@@ -153,7 +153,6 @@ class Engine : public gpg::IRealTimeEventListener {
   // synchronization primitive to synchronize
   // UIThread, Timer thread and gpg callback thread
   mutable std::mutex mutex_;
-  mutable std::mutex startup_mutex_;
 
   // Renderer of a teapot
   TeapotRenderer renderer_;
diff --git a/samples-android/ButtonClicker/jni/ButtonClickerNativeActivity_Engine.cpp b/samples-android/ButtonClicker/jni/ButtonClickerNativeActivity_Engine.cpp
@@ -60,12 +60,10 @@ void Engine::UnloadResources() { renderer_.Unload(); }
  */
 int Engine::InitDisplay(const int32_t cmd) {
   if (!initialized_resources_) {
-    startup_mutex_.lock();
     gl_context_->Init(app_->window);
     InitUI();
     LoadResources();
     initialized_resources_ = true;
-    startup_mutex_.unlock();
   } else {
     // initialize OpenGL ES and EGL
     if (EGL_SUCCESS != gl_context_->Resume(app_->window)) {
diff --git a/samples-android/Teapot/jni/NativeGameActivity.cpp b/samples-android/Teapot/jni/NativeGameActivity.cpp
@@ -112,16 +112,16 @@ Engine::~Engine() {
 }
 
 void Engine::InitUI() {
+  // The window is being shown, get it ready.
+  jui_helper::JUIWindow::Init(app_->activity, JUIHELPER_CLASS_NAME);
+
   // Show toast with app label
   ndk_helper::JNIHelper::GetInstance()->RunOnUiThread([]() {
     jui_helper::JUIToast toast(
       ndk_helper::JNIHelper::GetInstance()->GetAppLabel());
     toast.Show();
   });
 
-  // The window is being shown, get it ready.
-  jui_helper::JUIWindow::Init(app_->activity, JUIHELPER_CLASS_NAME);
-
   //
   // Buttons
   //
@@ -472,6 +472,9 @@ void Engine::UpdateFPS(float fps) {
 }
 
 void Engine::OnAuthActionStarted(gpg::AuthOperation op) {
+  if (!initialized_resources_) {
+    return;
+  }
   ndk_helper::JNIHelper::GetInstance()->RunOnUiThread([this, op]() {
     if (status_text_) {
       if (op == gpg::AuthOperation::SIGN_IN) {
@@ -485,6 +488,10 @@ void Engine::OnAuthActionStarted(gpg::AuthOperation op) {
 
 void Engine::OnAuthActionFinished(gpg::AuthOperation op,
                                   gpg::AuthStatus status) {
+  if (!initialized_resources_) {
+    return;
+  }
+
   ndk_helper::JNIHelper::GetInstance()->RunOnUiThread([this, status]() {
     if (status == gpg::AuthStatus::VALID) {
       jui_helper::JUIToast toast("Signed In.");
