X-Git-Url: https://deadsoftware.ru/gitweb?p=d2df-editor.git;a=blobdiff_plain;f=src%2Feditor%2Ff_options.pas;h=588d9c49a8c807e34d42960c4fdf9c762f977ff1;hp=b52113c85cf36b8b716f614e7605c809cd7629b4;hb=cd1d110f20a449413d8bce030b23847770d75d40;hpb=a542335e931437f83c4fd7e4e7a82add052f83d1

diff --git a/src/editor/f_options.pas b/src/editor/f_options.pas
index b52113c..588d9c4 100644
--- a/src/editor/f_options.pas
+++ b/src/editor/f_options.pas
@@ -145,8 +145,7 @@ begin
 end;
 
 procedure TOptionsForm.FormShow(Sender: TObject);
-  const langfilename = 'editor';
-  var info: TSearchRec;
+  var list: TStringList;
 begin
   sDotColor.Brush.Color := DotColor;
   cbShowDots.Checked := DotEnable;
@@ -173,13 +172,9 @@ begin
     cbLanguage.Items.BeginUpdate;
     cbLanguage.Items.Clear;
     cbLanguage.Items.Add('Auto');
-    if FindFirst(LangDir + DirectorySeparator + langfilename + '.*.mo', faAnyFile, info) = 0 then
-    begin
-      repeat
-        cbLanguage.Items.Add(Copy(ExtractFileNameWithoutExt(info.Name), Length(langfilename) + 2));
-      until FindNext(info) <> 0;
-      FindClose(info);
-    end;
+    list := g_Language_GetList();
+    cbLanguage.Items.AddStrings(list);
+    list.Free();
     cbLanguage.ItemIndex := IfThen(gLanguage = '', 0, cbLanguage.Items.IndexOf(gLanguage));
   finally
     cbLanguage.Items.EndUpdate;
@@ -216,13 +211,16 @@ var
 begin
   // General tab
 
-  if cbLanguage.ItemIndex <= 0 then str := '' else str := cbLanguage.Items[cbLanguage.ItemIndex];
-  if (str = '') or (gLanguage <> str) then
+  if cbLanguage.ItemIndex >= 0 then
   begin
-    gLanguage := str;
-    g_Language_Set(gLanguage);
+    if cbLanguage.ItemIndex = 0 then str := '' else str := cbLanguage.Items[cbLanguage.ItemIndex];
+    if (str = '') or (gLanguage <> str) then
+    begin
+      gLanguage := str;
+      g_Language_Set(gLanguage);
+    end;
   end;
-  
+
   DotColor := sDotColor.Brush.Color;
   DotEnable := cbShowDots.Checked;