From 0199fa7423f89a129da2b22a488f2c18e2e4727f Mon Sep 17 00:00:00 2001
From: Derek Sollenberger <djsollen@google.com>
Date: Thu, 23 Jun 2011 17:32:30 -0400
Subject: Skia Merge (revision 1562)

Change-Id: Ief005abc9eb741ccf5efec3d1f29fe2dfc23103d
---
 samplecode/SampleApp.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'samplecode')

diff --git a/samplecode/SampleApp.cpp b/samplecode/SampleApp.cpp
index 3efffe6..f05fe6e 100644
--- a/samplecode/SampleApp.cpp
+++ b/samplecode/SampleApp.cpp
@@ -848,7 +848,7 @@ void SampleWindow::afterChildren(SkCanvas* orig) {
             break;
 #ifdef SK_SUPPORT_GL
         case kGPU_CanvasType:
-            if (fShowZoomer) {
+            if (fShowZoomer && fGpuCanvas) {
                 this->showZoomer(fGpuCanvas);
             }
             delete fGpuCanvas;
-- 
cgit v1.1