commit 4750fa55f27e43770e7f5f3161ebdbac42e0da8a
author robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Apr 10 13:34:11 2012 +0000
committer robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Tue Apr 10 13:34:11 2012 +0000
tree c83868b8b2e1dd3ade71148192157b30555b0923
parent 363a4c22af71b8afedc00050ee5cc97fe4bd6f76

Minor bug fix in SampleApp

http://codereview.appspot.com/5992081/



git-svn-id: http://skia.googlecode.com/svn/trunk@3638 2bbb7eff-a529-9590-31e7-b0007b416f81

samplecode/SampleApp.cpp

diff --git a/samplecode/SampleApp.cpp b/samplecode/SampleApp.cpp
index 1cd9c67..3ab9e89 100644
--- a/samplecode/SampleApp.cpp
+++ b/samplecode/SampleApp.cpp
@@ -659,7 +659,9 @@
     SkDebugf("    msaa: request multisampling with the given sample count.\n");
 }
 
-SampleWindow::SampleWindow(void* hwnd, int argc, char** argv, DeviceManager* devManager) : INHERITED(hwnd) {
+SampleWindow::SampleWindow(void* hwnd, int argc, char** argv, DeviceManager* devManager) 
+    : INHERITED(hwnd)
+    , fDevManager(NULL) {
 
     SkGMRegistyToSampleRegistry();
     {
@@ -1952,6 +1954,7 @@
     }
 
     if (gDeviceTypeIsGPU[fDeviceType] &&
+        NULL != fDevManager &&
         fDevManager->getGrRenderTarget()->numSamples() > 0) {
         title.appendf(" [MSAA: %d]",
                        fDevManager->getGrRenderTarget()->numSamples());