aboutsummaryrefslogtreecommitdiffstats
path: root/samplecode
diff options
context:
space:
mode:
authorDerek Sollenberger <djsollen@google.com>2011-06-23 17:32:30 -0400
committerDerek Sollenberger <djsollen@google.com>2011-06-23 17:32:30 -0400
commit0199fa7423f89a129da2b22a488f2c18e2e4727f (patch)
treea831057e846066083c5bab3fb014313678ad1cac /samplecode
parent4eb5f622ae8a529cdf2a2fe6347e6bd97b5f28cb (diff)
downloadexternal_skia-0199fa7423f89a129da2b22a488f2c18e2e4727f.zip
external_skia-0199fa7423f89a129da2b22a488f2c18e2e4727f.tar.gz
external_skia-0199fa7423f89a129da2b22a488f2c18e2e4727f.tar.bz2
Skia Merge (revision 1562)
Change-Id: Ief005abc9eb741ccf5efec3d1f29fe2dfc23103d
Diffstat (limited to 'samplecode')
-rw-r--r--samplecode/SampleApp.cpp2
1 files changed, 1 insertions, 1 deletions
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;