reconcile main tree with open-source eclair

[android-x86/packages-apps-Gallery2.git] / src / com / cooliris / media / GridLayer.java

diff --git a/src/com/cooliris/media/GridLayer.java b/src/com/cooliris/media/GridLayer.java
index 5ab3ac4..fe804a2 100644 (file)
--- a/src/com/cooliris/media/GridLayer.java
+++ b/src/com/cooliris/media/GridLayer.java
@@ -778,9 +778,11 @@ public final class GridLayer extends RootLayer implements MediaFeed.Listener, Ti
     public void renderBlended(RenderView view, GL11 gl) {
         // We draw the placeholder for all visible slots.
         if (mHud != null && mDrawManager != null) {
-            mDrawManager.drawBlendedComponents(view, gl, mSelectedAlpha, mState, mHud.getMode(), mTimeElapsedSinceStackViewReady,
-                    mTimeElapsedSinceGridViewReady, sSelectedBucketList, sMarkedBucketList, mMediaFeed.getWaitingForMediaScanner()
-                            || mFeedAboutToChange || mMediaFeed.isLoading());
+            if (mMediaFeed != null) {
+                mDrawManager.drawBlendedComponents(view, gl, mSelectedAlpha, mState, mHud.getMode(),
+                        mTimeElapsedSinceStackViewReady, mTimeElapsedSinceGridViewReady, sSelectedBucketList, sMarkedBucketList,
+                        mMediaFeed.getWaitingForMediaScanner() || mFeedAboutToChange || mMediaFeed.isLoading());
+            }
         }
     }