1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/gallery3d/ui/GLRootView.java b/src/com/android/gallery3d/ui/GLRootView.java
index dc898d83d..4f3434593 100644
--- a/src/com/android/gallery3d/ui/GLRootView.java
+++ b/src/com/android/gallery3d/ui/GLRootView.java
@@ -499,9 +499,11 @@ public class GLRootView extends GLSurfaceView
                 listener = mIdleListeners.removeFirst();
             }
             mRenderLock.lock();
-            boolean keepInQueue;
+            boolean keepInQueue = false;
             try {
-                keepInQueue = listener.onGLIdle(mCanvas, mRenderRequested);
+                if (mCanvas != null) {
+                    keepInQueue = listener.onGLIdle(mCanvas, mRenderRequested);
+                }
             } finally {
                 mRenderLock.unlock();
             }