From 6572275c069699c753c906078580d7c507e120c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kjetil=20=C3=98rbekk?= <kjetil.orbekk@gmail.com>
Date: Thu, 1 Mar 2012 21:27:10 +0100
Subject: Fix NPE in finalize that accessed a Canvas.

---
 same-android/src/main/java/com/orbekk/same/GameView.java | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/same-android/src/main/java/com/orbekk/same/GameView.java b/same-android/src/main/java/com/orbekk/same/GameView.java
index 31ac27c..d21d05d 100644
--- a/same-android/src/main/java/com/orbekk/same/GameView.java
+++ b/same-android/src/main/java/com/orbekk/same/GameView.java
@@ -86,11 +86,15 @@ public class GameView extends SurfaceView implements SurfaceHolder.Callback {
                 Canvas c = null;
                 try {
                     c = holder.lockCanvas();
-                    synchronized(holder) {
-                        doDraw(c);
+                    if (c != null) {
+                        synchronized(holder) {
+                            doDraw(c);
+                        }
                     }
                 } finally {
-                    holder.unlockCanvasAndPost(c);
+                    if (c != null) {
+                        holder.unlockCanvasAndPost(c);
+                    }
                 }
                 synchronized (this) {
                     if (Thread.interrupted()) {
-- 
cgit v1.2.3