commit 661ddb92f091eb5356b7765094e397b164c5161f
author Andreas Huber <andih@google.com> Tue Apr 16 09:18:32 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Apr 16 09:18:32 2013 -0700
tree 20ef6378812fe298e070eddeae2151f29170d500
parent 956d23db7ab5fc8aaf91447c46a1ca3bcde82c93
parent 212c97d15f8b06fcbbe181aa4cb922ca67a20351

am 212c97d1: am f5c02110: Merge "Guard against mLooper == NULL." into jb-mr2-dev

* commit '212c97d15f8b06fcbbe181aa4cb922ca67a20351':
  Guard against mLooper == NULL.

media/libmediaplayerservice/nuplayer/RTSPSource.cpp

diff --git a/media/libmediaplayerservice/nuplayer/RTSPSource.cpp b/media/libmediaplayerservice/nuplayer/RTSPSource.cpp
index a5ff0ca..50ebf9c 100644
--- a/media/libmediaplayerservice/nuplayer/RTSPSource.cpp
+++ b/media/libmediaplayerservice/nuplayer/RTSPSource.cpp
@@ -66,7 +66,9 @@
 }
 
 NuPlayer::RTSPSource::~RTSPSource() {
-   mLooper->stop();
+    if (mLooper != NULL) {
+        mLooper->stop();
+    }
 }
 
 void NuPlayer::RTSPSource::prepareAsync() {