* Applied Jean-Marc's patch to gui_listbox fixing issues in editcombo.

1 files changed, 10 insertions, 9 deletions

diff --git a/src/gui/gui_listbox.pas b/src/gui/gui_listbox.pas
index 2825df34..dd631dd7 100644
--- a/src/gui/gui_listbox.pas
+++ b/src/gui/gui_listbox.pas
@@ -775,16 +775,17 @@ var
 begin
   // If the user pressed a key then it will search the stringlist for a word
   // beginning with that letter
-  if (Ord(AText[1]) > 31) and (Ord(AText[1]) < 127) and (FFocusItem > -1) or (Length(AText) > 1 ) then
-    for i := FFocusItem to FItems.Count-1 do
-    begin
-      if SameText(LeftStr(FItems.Strings[i], Length(AText)), AText) then
+  if (Ord(AText[1]) > 31) and (Ord(AText[1]) < 127) or (Length(AText) > 1 ) then
+    if FFocusItem > -1 then
+      for i := FFocusItem to FItems.Count-1 do
       begin
-        FocusItem := i;
-        Consumed := True;
-        break;
-      end;
-    end;  { for }
+        if SameText(LeftStr(FItems.Strings[i], Length(AText)), AText) then
+        begin
+          FocusItem := i;
+          Consumed := True;
+          break;
+        end;
+      end;  { for }
   inherited HandleKeyChar(AText, shiftstate, consumed);
 end;