Skip to content

Commit 80011c6

Browse files
committed
Fix null ref exception
1 parent aeca037 commit 80011c6

File tree

1 file changed

+12
-15
lines changed

1 file changed

+12
-15
lines changed

‎Telegram/Controls/CaptionTextBox.cs

+12-15
Original file line numberDiff line numberDiff line change
@@ -94,30 +94,27 @@ protected override void OnKeyDown(KeyRoutedEventArgs e)
9494
}
9595
else
9696
{
97-
autocomplete = View.Autocomplete;
97+
autocomplete = View?.Autocomplete;
9898
autocompleteList = ControlledList;
9999
}
100100

101101
var modifiers = WindowContext.KeyModifiers();
102102

103-
if (e.Key is VirtualKey.Up or VirtualKey.Down)
103+
if (e.Key is VirtualKey.Up or VirtualKey.Down && modifiers == VirtualKeyModifiers.None)
104104
{
105-
if (e.Key is VirtualKey.Up or VirtualKey.Down && modifiers == VirtualKeyModifiers.None)
105+
if (autocompleteList != null && autocompleteList.Items.Count > 0 && autocomplete?.Orientation == Orientation.Vertical)
106106
{
107-
if (autocompleteList != null && autocompleteList.Items.Count > 0 && autocomplete?.Orientation == Orientation.Vertical)
108-
{
109-
autocompleteList.SelectionMode = ListViewSelectionMode.Single;
110-
111-
var index = e.Key == VirtualKey.Up ? -1 : 1;
112-
var next = autocompleteList.SelectedIndex + index;
113-
if (next >= 0 && next < autocomplete.Count)
114-
{
115-
autocompleteList.SelectedIndex = next;
116-
autocompleteList.ScrollIntoView(autocompleteList.SelectedItem);
117-
}
107+
autocompleteList.SelectionMode = ListViewSelectionMode.Single;
118108

119-
e.Handled = true;
109+
var index = e.Key == VirtualKey.Up ? -1 : 1;
110+
var next = autocompleteList.SelectedIndex + index;
111+
if (next >= 0 && next < autocomplete.Count)
112+
{
113+
autocompleteList.SelectedIndex = next;
114+
autocompleteList.ScrollIntoView(autocompleteList.SelectedItem);
120115
}
116+
117+
e.Handled = true;
121118
}
122119
}
123120
else if (e.Key is VirtualKey.Left or VirtualKey.Right && modifiers == VirtualKeyModifiers.None)

0 commit comments

Comments
 (0)