From c075d3de08accdd9f49d1e347a3aad4b6607a078 Mon Sep 17 00:00:00 2001
From: Drison64 <Drison64@seznam.cz>
Date: Sat, 17 Sep 2022 22:43:40 +0200
Subject: [PATCH] Create a test and a check if initial zoom value of
 ZoomableScrollContainer is in range

---
 .../Editing/TestSceneZoomableScrollContainer.cs     | 13 +++++++++++++
 .../Components/Timeline/ZoomableScrollContainer.cs  |  3 +++
 2 files changed, 16 insertions(+)

diff --git a/osu.Game.Tests/Visual/Editing/TestSceneZoomableScrollContainer.cs b/osu.Game.Tests/Visual/Editing/TestSceneZoomableScrollContainer.cs
index ce418f33f0..1858aee76b 100644
--- a/osu.Game.Tests/Visual/Editing/TestSceneZoomableScrollContainer.cs
+++ b/osu.Game.Tests/Visual/Editing/TestSceneZoomableScrollContainer.cs
@@ -3,6 +3,7 @@
 
 #nullable disable
 
+using System;
 using NUnit.Framework;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Colour;
@@ -66,6 +67,18 @@ namespace osu.Game.Tests.Visual.Editing
             AddUntilStep("Scroll container is loaded", () => scrollContainer.LoadState >= LoadState.Loaded);
         }
 
+        [Test]
+        public void TestInitialZoomOutOfRange()
+        {
+            AddStep("Invalid ZoomableScrollContainer throws ArgumentException", () =>
+            {
+                Assert.Throws<ArgumentException>(() =>
+                {
+                    _ = new ZoomableScrollContainer(1, 60, 0);
+                });
+            });
+        }
+
         [Test]
         public void TestWidthInitialization()
         {
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/ZoomableScrollContainer.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/ZoomableScrollContainer.cs
index 7d51284f46..0fb59a8a1f 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/ZoomableScrollContainer.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/ZoomableScrollContainer.cs
@@ -87,6 +87,9 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
             if (minimum > maximum)
                 throw new ArgumentException($"{nameof(minimum)} ({minimum}) must be less than {nameof(maximum)} ({maximum})");
 
+            if (initial < minimum || initial > maximum)
+                throw new ArgumentException($"{nameof(initial)} ({initial}) must be between {nameof(minimum)} ({minimum}) and {nameof(maximum)} ({maximum})");
+
             minZoom = minimum;
             maxZoom = maximum;
             CurrentZoom = zoomTarget = initial;