Merge pull request #6293 from smoogipoo/fix-incorrect-assert

Fix incorrect assertion and possible nullref
ppy · May 21, 2024 · d48e771 · d48e771
2 parents fdb335b + a6d5fb7
commit d48e771
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/osu.Framework/Graphics/UserInterface/TextBox.cs b/osu.Framework/Graphics/UserInterface/TextBox.cs
@@ -1377,20 +1377,21 @@ private void bindInput([CanBeNull] TextBox previous)
 
         private void unbindInput([CanBeNull] TextBox next)
         {
-            Debug.Assert(textInput != null);
-
             if (!textInputBound)
                 return;
 
             textInputBound = false;
 
-            // see the comment above, in `bindInput(bool)`.
-            if (next?.textInput != textInput)
-                textInput.Deactivate();
+            if (textInput != null)
+            {
+                // see the comment above, in `bindInput(bool)`.
+                if (next?.textInput != textInput)
+                    textInput.Deactivate();
 
-            textInput.OnTextInput -= handleTextInput;
-            textInput.OnImeComposition -= handleImeComposition;
-            textInput.OnImeResult -= handleImeResult;
+                textInput.OnTextInput -= handleTextInput;
+                textInput.OnImeComposition -= handleImeComposition;
+                textInput.OnImeResult -= handleImeResult;
+            }
 
             // in case keys are held and we lose focus, we should no longer block key events
             textInputBlocking = false;