Add more check for renderer

celestiamobile · Nov 30, 2020 · b7bec6a · b7bec6a
1 parent fc83f3b
commit b7bec6a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -13,8 +13,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="space.celestia.mobilecelestia"
-    android:versionCode="129"
-    android:versionName="1.2.1">
+    android:versionCode="140"
+    android:versionName="1.2.2">
 
     <uses-feature android:glEsVersion="0x00020000" android:required="true" />
     <uses-permission android:name="android.permission.INTERNET"/>

diff --git a/app/src/main/cpp/CelestiaRenderer.cpp b/app/src/main/cpp/CelestiaRenderer.cpp
@@ -162,6 +162,12 @@ bool CelestiaRenderer::initialize()
         }
     }
 
+    if (surface != EGL_NO_SURFACE) {
+        eglMakeCurrent(display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
+        eglDestroySurface(display, surface);
+        surface = EGL_NO_SURFACE;
+    }
+
     if (window) {
         ANativeWindow_setBuffersGeometry(window, 0, 0, format);
         if (!(surface = eglCreateWindowSurface(display, config, window, nullptr))) {
@@ -175,9 +181,6 @@ bool CelestiaRenderer::initialize()
             destroy();
             return false;
         }
-    } else {
-        eglDestroySurface(display, surface);
-        surface = EGL_NO_SURFACE;
     }
     return true;
 }
@@ -318,7 +321,7 @@ void *CelestiaRenderer::threadCallback(void *self)
     bool renderingEnabled = true;
 
     while (renderingEnabled) {
-        if (renderer->display != EGL_NO_DISPLAY && !renderer->engineStartedCalled)
+        if (renderer->surface != EGL_NO_SURFACE && !renderer->engineStartedCalled)
             renderer->engineStartedCalled = newEnv->CallBooleanMethod(renderer->javaObject, CelestiaRenderer::engineStartedMethod) == JNI_TRUE;
         if (renderer->engineStartedCalled)
             newEnv->CallVoidMethod(renderer->javaObject, CelestiaRenderer::flushTasksMethod);
@@ -340,7 +343,7 @@ void *CelestiaRenderer::threadCallback(void *self)
         }
         renderer->msg = CelestiaRenderer::MSG_NONE;
 
-        if (renderer->engineStartedCalled && renderer->core) {
+        if (renderer->engineStartedCalled && renderer->surface != EGL_NO_SURFACE && renderer->core) {
             renderer->resizeIfNeeded();
             renderer->tickAndDraw();
         }