From 255bb9d10092ede439c0d8c5f71b7ca707880a37 Mon Sep 17 00:00:00 2001
From: Charlie <charliegray.dev@gmail.com>
Date: Mon, 26 Oct 2020 14:52:59 -0500
Subject: [PATCH] fixed issue with returns
---
.../Edit/Compose/Components/SelectionHandler.cs | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
index f4b98c66b1..f0a9e69321 100644
--- a/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
@@ -226,11 +226,11 @@ namespace osu.Game.Screens.Edit.Compose.Components
/// <param name="state">The input state at the point of selection.</param>
internal void HandleSelectionRequested(SelectionBlueprint blueprint, InputState state)
{
- shiftClickDeleteCheck(blueprint, state);
- multiSelectionHandler(blueprint, state);
+ if (!shiftClickDeleteCheck(blueprint, state))
+ handleMultiSelection(blueprint, state);
}
- private void multiSelectionHandler(SelectionBlueprint blueprint, InputState state)
+ private void handleMultiSelection(SelectionBlueprint blueprint, InputState state)
{
if (state.Keyboard.ControlPressed)
{
@@ -249,13 +249,14 @@ namespace osu.Game.Screens.Edit.Compose.Components
}
}
- private void shiftClickDeleteCheck(SelectionBlueprint blueprint, InputState state)
+ private bool shiftClickDeleteCheck(SelectionBlueprint blueprint, InputState state)
{
if (state.Keyboard.ShiftPressed && state.Mouse.IsPressed(MouseButton.Right))
{
EditorBeatmap.Remove(blueprint.HitObject);
- return;
+ return true;
}
+ return false;
}
private void deleteSelected()