From 719b4cc3d2963f836cdcea00e7730321a89ffe0a Mon Sep 17 00:00:00 2001 From: bentmar Date: Fri, 28 Apr 2017 11:15:09 +0200 Subject: [Android] Add disposed check on FastRenderers.LabelRenderer (#886) * add disposed check on FastLabelRenderer Description of Change Check is the Label is dispodes on GetDesiredSize() on fast LabelRenderer Bugs Fixed System.ObjectDisposedException: Cannot access a disposed object. API Changes None Behavioral Changes None * Update LabelRenderer.cs --- Xamarin.Forms.Platform.Android/FastRenderers/LabelRenderer.cs | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'Xamarin.Forms.Platform.Android') diff --git a/Xamarin.Forms.Platform.Android/FastRenderers/LabelRenderer.cs b/Xamarin.Forms.Platform.Android/FastRenderers/LabelRenderer.cs index 7681f54b..aa1f06e0 100644 --- a/Xamarin.Forms.Platform.Android/FastRenderers/LabelRenderer.cs +++ b/Xamarin.Forms.Platform.Android/FastRenderers/LabelRenderer.cs @@ -62,6 +62,11 @@ namespace Xamarin.Forms.Platform.Android.FastRenderers SizeRequest IVisualElementRenderer.GetDesiredSize(int widthConstraint, int heightConstraint) { + if (_disposed) + { + return new SizeRequest(); + } + if (_lastSizeRequest.HasValue) { // if we are measuring the same thing, no need to waste the time @@ -308,4 +313,4 @@ namespace Xamarin.Forms.Platform.Android.FastRenderers _lastSizeRequest = null; } } -} \ No newline at end of file +} -- cgit v1.2.3