Merge branch 'feat.more-keybinds' of https://github.com/zacharied/Ong…

…ekiFumenEditor into batch_mode
NyagekiFumenProject · Nov 4, 2024 · 7a95429 · 7a95429
2 parents 743bd32 + bbaaf7b
commit 7a95429
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 15 deletions.
diff --git a/...Modules/FumenVisualEditor/ViewModels/FumenVisualEditorViewModel.UserInteractionActions.cs b/...Modules/FumenVisualEditor/ViewModels/FumenVisualEditorViewModel.UserInteractionActions.cs
@@ -1788,8 +1788,8 @@ public void ToastNotify(string message)
                 if (tX.TGrid != obj.TGrid) return false;
                 if (obj is OngekiMovableObjectBase movable)
                 {
-                    var mX = (OngekiMovableObjectBase)x;
-                    if (movable.XGrid != mX.XGrid) return false;
+                    var mX = x as OngekiMovableObjectBase;
+                    if (movable.XGrid != mX?.XGrid) return false;
                 }
 
                 return obj switch

diff --git a/OngekiFumenEditor/Properties/Resources.Designer.cs b/OngekiFumenEditor/Properties/Resources.Designer.cs