From 21f7d6d2fecce113b129d94e51882c81bd201732 Mon Sep 17 00:00:00 2001
From: "braveyao@webrtc.org"
 <braveyao@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d>
Date: Thu, 22 May 2014 02:57:55 +0000
Subject: [PATCH] WebRTCDemo: move the deletion of CritSect to end of the dtor
 to fix a crash in Android video renderer.

BUG=3368
TEST=Manual Test

Review URL: https://webrtc-codereview.appspot.com/21519005

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6220 4adac7df-926f-26a2-2b94-8c16560cd09d
---
 .../android/video_render_android_native_opengl2.cc             | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/webrtc/modules/video_render/android/video_render_android_native_opengl2.cc b/webrtc/modules/video_render/android/video_render_android_native_opengl2.cc
index 2057e282f4..c2afbbd639 100644
--- a/webrtc/modules/video_render/android/video_render_android_native_opengl2.cc
+++ b/webrtc/modules/video_render/android/video_render_android_native_opengl2.cc
@@ -245,7 +245,6 @@ AndroidNativeOpenGl2Channel::AndroidNativeOpenGl2Channel(
 AndroidNativeOpenGl2Channel::~AndroidNativeOpenGl2Channel() {
   WEBRTC_TRACE(kTraceInfo, kTraceVideoRenderer, _id,
                "AndroidNativeOpenGl2Channel dtor");
-  delete &_renderCritSect;
   if (_jvm) {
     // get the JNI env for this thread
     bool isAttached = false;
@@ -277,6 +276,8 @@ AndroidNativeOpenGl2Channel::~AndroidNativeOpenGl2Channel() {
       }
     }
   }
+
+  delete &_renderCritSect;
 }
 
 int32_t AndroidNativeOpenGl2Channel::Init(int32_t zOrder,