From 698d549fd1e7f01bf6ec8f9ebcb14d34b077ff6b Mon Sep 17 00:00:00 2001
From: Andy2 <andy2@trand>
Date: Thu, 21 Jul 2011 05:07:41 -0700
Subject: [PATCH] assert fired for unknown reason. Fix behavior in
 non-assert-enabled build to do the right thing in that case.

---
 xwords4/android/XWords4/jni/utilwrapper.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/xwords4/android/XWords4/jni/utilwrapper.c b/xwords4/android/XWords4/jni/utilwrapper.c
index ea84097aa..416b51749 100644
--- a/xwords4/android/XWords4/jni/utilwrapper.c
+++ b/xwords4/android/XWords4/jni/utilwrapper.c
@@ -249,7 +249,8 @@ utilTimerFired( XW_UtilCtxt* uc, XWTimerReason why, int handle )
     AndUtil* util = (AndUtil*)uc;
     TimerStorage* timerStorage = &util->timerStorage[why];
     XP_ASSERT( handle == (int)timerStorage );
-    return (*timerStorage->proc)( timerStorage->closure, why );
+    return (handle == (int)timerStorage)
+        && (*timerStorage->proc)( timerStorage->closure, why );
 }
 
 static void