Fix android StartTimer race condition (#196)

xamarin · May 27, 2016 · 2a09b39 · 2a09b39
1 parent 4b30cb4
commit 2a09b39
Showing 1 changed file with 13 additions and 6 deletions.
diff --git a/Xamarin.Forms.Platform.Android/Forms.cs b/Xamarin.Forms.Platform.Android/Forms.cs
@@ -361,13 +361,20 @@ public void OpenUriAction(Uri uri)
 			public void StartTimer(TimeSpan interval, Func<bool> callback)
 			{
 				Timer timer = null;
-				TimerCallback onTimeout = o => BeginInvokeOnMainThread(() =>
+				bool invoking = false;
+				TimerCallback onTimeout = o =>
 				{
-					if (callback())
-						return;
-
-					timer.Dispose();
-				});
+					if (!invoking)
+					{
+						invoking = true;
+						BeginInvokeOnMainThread(() =>
+						{
+							if (!callback())
+								timer.Dispose();
+							invoking = false;
+						});
+					}
+				};
 				timer = new Timer(onTimeout, null, interval, interval);
 			}