fixed search function not working

Author: chihirobelmo

FalconBMS Alternative Launcher Cs/MainWindowKeyMapping.cs

@@ -227,7 +227,7 @@ private void DataGrid_GotFocus(object sender, RoutedEventArgs e)
             statusSearch = Search.Assign;
             Label_AssgnStatus.Content = "AWAITING INPUTS";
         }
-        
+
         private void KeyMappingGrid_MouseRightButtonDown(object sender, MouseButtonEventArgs e)
         {
             KeyMappingGrid.UnselectAllCells();
@@ -383,8 +383,12 @@ public void JumptoAssignedKey()
 
         private void KeyMappingGrid_KeyDown()
         {
-            KeyMappingGrid.ScrollIntoView(KeyMappingGrid.Items[currentIndex]);
-            KeyMappingGrid.SelectedIndex = currentIndex;
+            if (currentIndex < 0)
+            {
+                currentIndex = 1;
+                statusSearch = Search.Search;
+                return;
+            }
             if (SearchBox.IsSelectionActive == true)
                 return;
             if (SearchBox.IsFocused == true)
@@ -400,9 +404,6 @@ private void KeyMappingGrid_KeyDown()
 
             directInputDevice.GetCurrentKeyboardState();
 
-            //if (directInputDevice.KeyboardState[(Microsoft.DirectX.DirectInput.Key)211])
-            //    Console.WriteLine("delete!");
-
             for (int i = 1; i < 238; i++)
             {
                 if (directInputDevice.KeyboardState[(Microsoft.DirectX.DirectInput.Key)i])
@@ -457,6 +458,8 @@ private void KeyMappingGrid_KeyDown()
             if (Select_PinkyShift.IsChecked == false)
                 pinkyStatus = Pinky.Shift;
 
+            KeyMappingGrid.ScrollIntoView(KeyMappingGrid.Items[currentIndex]);
+            KeyMappingGrid.SelectedIndex = currentIndex;
             if (pinkyStatus == Pinky.UnShift)
                 keyAssign[currentIndex].SetKeyboard(catchedScanCode, Shift, Ctrl, Alt);
             if (pinkyStatus == Pinky.Shift)