From 477db87c644c090bbd97679a316e6e83fe35b447 Mon Sep 17 00:00:00 2001 From: JyHu Date: Wed, 6 Dec 2017 20:18:36 +0800 Subject: [PATCH 1/2] Fix a bug may cause infinite loop. --- Source/Charts/Charts/BarLineChartViewBase.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Charts/Charts/BarLineChartViewBase.swift b/Source/Charts/Charts/BarLineChartViewBase.swift index 1ea179cf01..a4958c5a17 100644 --- a/Source/Charts/Charts/BarLineChartViewBase.swift +++ b/Source/Charts/Charts/BarLineChartViewBase.swift @@ -927,7 +927,7 @@ open class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChartD gestureRecognizer == _panGestureRecognizer { var scrollView = self.superview - while !(scrollView is NSUIScrollView) + while !(scrollView is NSUIScrollView) && scrollView != nil { scrollView = scrollView?.superview } From 757d444e7faf15df66e68c90aab526f682490279 Mon Sep 17 00:00:00 2001 From: Xuan Date: Fri, 8 Dec 2017 16:44:36 +0800 Subject: [PATCH 2/2] Update BarLineChartViewBase.swift put nil check first seems better --- Source/Charts/Charts/BarLineChartViewBase.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Charts/Charts/BarLineChartViewBase.swift b/Source/Charts/Charts/BarLineChartViewBase.swift index a4958c5a17..f272e3367d 100644 --- a/Source/Charts/Charts/BarLineChartViewBase.swift +++ b/Source/Charts/Charts/BarLineChartViewBase.swift @@ -927,7 +927,7 @@ open class BarLineChartViewBase: ChartViewBase, BarLineScatterCandleBubbleChartD gestureRecognizer == _panGestureRecognizer { var scrollView = self.superview - while !(scrollView is NSUIScrollView) && scrollView != nil + while scrollView != nil && !(scrollView is NSUIScrollView) { scrollView = scrollView?.superview }