From 0a4a431f7436503b95cad0135deb44aff3e1b15c Mon Sep 17 00:00:00 2001 From: Wojtek Figat Date: Sun, 1 Dec 2024 21:55:19 +0100 Subject: [PATCH] Fix exception regression --- Source/Editor/GUI/CurveEditor.cs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/Source/Editor/GUI/CurveEditor.cs b/Source/Editor/GUI/CurveEditor.cs index 1de56b993..837106c6f 100644 --- a/Source/Editor/GUI/CurveEditor.cs +++ b/Source/Editor/GUI/CurveEditor.cs @@ -680,10 +680,12 @@ namespace FlaxEditor.GUI Float2.Min(ref minPos, ref pos, out minPos); } var minPosPoint = _contents.PointToParent(ref minPos); - var scroll = new Float2(_mainPanel.HScrollBar.TargetValue, _mainPanel.VScrollBar.TargetValue); + var scroll = new Float2(_mainPanel.HScrollBar?.TargetValue ?? 0, _mainPanel.VScrollBar?.TargetValue ?? 0); scroll = ApplyUseModeMask(EnablePanning, minPosPoint, scroll); - _mainPanel.HScrollBar.TargetValue = scroll.X; - _mainPanel.VScrollBar.TargetValue = scroll.Y; + if (_mainPanel.HScrollBar != null && _mainPanel.HScrollBar.Enabled) + _mainPanel.HScrollBar.TargetValue = scroll.X; + if (_mainPanel.VScrollBar != null && _mainPanel.VScrollBar.Enabled) + _mainPanel.VScrollBar.TargetValue = scroll.Y; UpdateKeyframes(); }