2 files changed, 4 insertions, 2 deletions
diff --git a/WebKit/android/jni/WebViewCore.cpp b/WebKit/android/jni/WebViewCore.cpp
index a1f4354..8f5cc45 100644
--- a/WebKit/android/jni/WebViewCore.cpp
+++ b/WebKit/android/jni/WebViewCore.cpp
@@ -3288,7 +3288,8 @@ static void FullScreenPluginHidden(JNIEnv* env, jobject obj, jint npp)
 {
     WebViewCore* viewImpl = GET_NATIVE_VIEW(env, obj);
     PluginWidgetAndroid* plugin = viewImpl->getPluginWidget((NPP)npp);
-    plugin->exitFullScreen(false);
+    if (plugin)
+        plugin->exitFullScreen(false);
 }
 
 static WebCore::IntRect jrect_to_webrect(JNIEnv* env, jobject obj)
diff --git a/WebKit/android/plugins/PluginWidgetAndroid.cpp b/WebKit/android/plugins/PluginWidgetAndroid.cpp
index 7a4b9a3..ac668d7 100644
--- a/WebKit/android/plugins/PluginWidgetAndroid.cpp
+++ b/WebKit/android/plugins/PluginWidgetAndroid.cpp
@@ -65,7 +65,8 @@ PluginWidgetAndroid::~PluginWidgetAndroid() {
         m_core->removePlugin(this);
         if (m_isFullScreen) {
             exitFullScreen(true);
-        } else if (m_embeddedView) {
+        }
+        if (m_embeddedView) {
             m_core->destroySurface(m_embeddedView);
         }
     }