Merge "Don't delete objects twice..." into honeycomb

1 files changed, 2 insertions, 2 deletions

diff --git a/libs/hwui/DisplayListRenderer.h b/libs/hwui/DisplayListRenderer.h
index 112e45596f8b..f183473fc8f5 100644
--- a/libs/hwui/DisplayListRenderer.h
+++ b/libs/hwui/DisplayListRenderer.h
@@ -413,10 +413,10 @@ private:
 
         SkiaShader* shaderCopy = mShaderMap.valueFor(shader);
         // TODO: We also need to handle generation ID changes in compose shaders
-        if (!shaderCopy || shaderCopy->getGenerationId() != shader->getGenerationId()) {
+        if (shaderCopy == NULL || shaderCopy->getGenerationId() != shader->getGenerationId()) {
             shaderCopy = shader->copy();
             mShaderMap.add(shader, shaderCopy);
-            mShaders.add(shader);
+            mShaders.add(shaderCopy);
         }
 
         addInt((int) shaderCopy);