diff options
| -rw-r--r-- | src/com/android/launcher/LiveFolder.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/com/android/launcher/LiveFolder.java b/src/com/android/launcher/LiveFolder.java index 5d727f830..44a283e09 100644 --- a/src/com/android/launcher/LiveFolder.java +++ b/src/com/android/launcher/LiveFolder.java @@ -90,7 +90,13 @@ public class LiveFolder extends Folder { if (mLoadingTask != null && mLoadingTask.getStatus() == AsyncTask.Status.RUNNING) { mLoadingTask.cancel(true); } - ((LiveFolderAdapter) mContent.getAdapter()).cleanup(); + + // The adapter can be null if onClose() is called before FolderLoadingTask + // is done querying the provider + final LiveFolderAdapter adapter = (LiveFolderAdapter) mContent.getAdapter(); + if (adapter != null) { + adapter.cleanup(); + } } static class FolderLoadingTask extends AsyncTask<LiveFolderInfo, Void, Cursor> { |