fixed to set mWebView = null in ui thread (mWebView should always be …

…modifed in UI thread). (gree#997)
ZooTakuya · Oct 22, 2023 · 23a2807 · 23a2807
1 parent 343c17b
commit 23a2807
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/plugins/Android/webview-nofragment/src/main/java/net/gree/unitywebview/CWebViewPlugin.java b/plugins/Android/webview-nofragment/src/main/java/net/gree/unitywebview/CWebViewPlugin.java
@@ -591,12 +591,12 @@ public void onGlobalLayout() {
 
     public void Destroy() {
         final Activity a = UnityPlayer.currentActivity;
-        final WebView webView = mWebView;
-        mWebView = null;
         if (CWebViewPlugin.isDestroyed(a)) {
             return;
         }
         a.runOnUiThread(new Runnable() {public void run() {
+            final WebView webView = mWebView;
+            mWebView = null;
             if (webView == null) {
                 return;
             }

diff --git a/plugins/Android/webview/src/main/java/net/gree/unitywebview/CWebViewPlugin.java b/plugins/Android/webview/src/main/java/net/gree/unitywebview/CWebViewPlugin.java
@@ -908,13 +908,13 @@ private File createImageFile() throws IOException {
     public void Destroy() {
         final Activity a = UnityPlayer.currentActivity;
         final CWebViewPlugin self = this;
-        final WebView webView = mWebView;
-        mWebView = null;
         mMessages.clear();
         if (CWebViewPlugin.isDestroyed(a)) {
             return;
         }
         a.runOnUiThread(new Runnable() {public void run() {
+            final WebView webView = mWebView;
+            mWebView = null;
             if (webView == null) {
                 return;
             }