From 707d51e999cb845a479ddb7053bd4110870f703f Mon Sep 17 00:00:00 2001 From: Rudy Huyn Date: Tue, 16 Apr 2019 18:17:22 -0700 Subject: [PATCH] verify if m_expressionContainer is set when scrolling left or right --- src/Calculator/Controls/OverflowTextBlock.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Calculator/Controls/OverflowTextBlock.cpp b/src/Calculator/Controls/OverflowTextBlock.cpp index c946d79b..a31a13af 100644 --- a/src/Calculator/Controls/OverflowTextBlock.cpp +++ b/src/Calculator/Controls/OverflowTextBlock.cpp @@ -107,7 +107,7 @@ void OverflowTextBlock::UpdateVisualState() void OverflowTextBlock::ScrollLeft() { - if (m_expressionContainer->HorizontalOffset > 0) + if (m_expressionContainer != nullptr && m_expressionContainer->HorizontalOffset > 0) { m_scrollingLeft = true; double offset = m_expressionContainer->HorizontalOffset - (scrollRatio * m_expressionContainer->ViewportWidth); @@ -119,7 +119,7 @@ void OverflowTextBlock::ScrollLeft() void OverflowTextBlock::ScrollRight() { - if (m_expressionContainer->HorizontalOffset < m_expressionContainer->ExtentWidth - m_expressionContainer->ViewportWidth) + if (m_expressionContainer != nullptr && m_expressionContainer->HorizontalOffset < m_expressionContainer->ExtentWidth - m_expressionContainer->ViewportWidth) { m_scrollingRight = true; double offset = m_expressionContainer->HorizontalOffset + (scrollRatio * m_expressionContainer->ViewportWidth);