commit 8e732ffd92d538aaa9376b560b0ff2fc5ac78c43
author Marco Nelissen <marcone@google.com> Mon Oct 12 12:29:09 2009 -0700
committer Marco Nelissen <marcone@google.com> Mon Oct 12 12:29:09 2009 -0700
tree d56bc79a8a1be72ee44f56e77fcf73500d1614e0
parent 1c0d6005816e6aaa53aff249c67a77b6290fede0

Make sure we actually have an adapter before trying to access it.
Fixes bug 2177763.

src/com/android/music/PlaylistBrowserActivity.java

diff --git a/src/com/android/music/PlaylistBrowserActivity.java b/src/com/android/music/PlaylistBrowserActivity.java
index ccdb529..3c5ad22 100644
--- a/src/com/android/music/PlaylistBrowserActivity.java
+++ b/src/com/android/music/PlaylistBrowserActivity.java
@@ -169,7 +169,9 @@
     @Override
     public void onDestroy() {
         MusicUtils.unbindFromService(this);
-        if (!mAdapterSent) {
+        // if we have an adapter and didn't send it off to another activity yet, we should
+        // close the cursor
+        if (!mAdapterSent && mAdapter != null) {
             Cursor c = mAdapter.getCursor();
             if (c != null) {
                 c.close();