diff --git a/editor/studio/AMXX_Studio.dof b/editor/studio/AMXX_Studio.dof index 8a9e6749..19a3f49f 100755 --- a/editor/studio/AMXX_Studio.dof +++ b/editor/studio/AMXX_Studio.dof @@ -115,7 +115,7 @@ AutoIncBuild=1 MajorVer=1 MinorVer=2 Release=0 -Build=2 +Build=3 Debug=0 PreRelease=0 Special=0 @@ -126,7 +126,7 @@ CodePage=1252 [Version Info Keys] CompanyName=AMX Mod X Dev Team FileDescription= -FileVersion=1.2.0.2 +FileVersion=1.2.0.3 InternalName= LegalCopyright= LegalTrademarks= diff --git a/editor/studio/AMXX_Studio.exe b/editor/studio/AMXX_Studio.exe index a4e4520b..5e67fdee 100755 Binary files a/editor/studio/AMXX_Studio.exe and b/editor/studio/AMXX_Studio.exe differ diff --git a/editor/studio/AMXX_Studio.res b/editor/studio/AMXX_Studio.res index d10553d3..96f90916 100755 Binary files a/editor/studio/AMXX_Studio.res and b/editor/studio/AMXX_Studio.res differ diff --git a/editor/studio/UnitfrmMain.pas b/editor/studio/UnitfrmMain.pas index 2453f8bd..6c95f6b3 100755 --- a/editor/studio/UnitfrmMain.pas +++ b/editor/studio/UnitfrmMain.pas @@ -1607,7 +1607,7 @@ begin end; end; eSavedFiles.SaveToFile(ExtractFilePath(ParamStr(0)) + 'config\Cache.cfg'); - eSavedFiles.Destroy; + eSavedFiles.Free; end; procedure TfrmMain.trvExplorerDblClick(Sender: TObject); diff --git a/editor/studio/UnitfrmSettings.pas b/editor/studio/UnitfrmSettings.pas index c2d46c60..5cdb112e 100755 --- a/editor/studio/UnitfrmSettings.pas +++ b/editor/studio/UnitfrmSettings.pas @@ -189,7 +189,6 @@ type procedure txtFontSizeChange(Sender: TObject); procedure cboLanguageChange(Sender: TObject); procedure chkUseDefaultFontClick(Sender: TObject); - procedure cboFontChange(Sender: TObject); procedure chkBoldClick(Sender: TObject); procedure chkItalicClick(Sender: TObject); procedure chkUnderlinedClick(Sender: TObject); @@ -243,6 +242,7 @@ type procedure cmdResetShortcutsClick(Sender: TObject); procedure txtShortcutKeyUp(Sender: TObject; var Key: Word; Shift: TShiftState); + procedure cboFontChange(Sender: TObject); public Foreground, Background: TColor; CaretFore, CaretBack: TColor; @@ -372,12 +372,6 @@ begin TSciStyle(TSciLangItem(frmMain.sciEditor.LanguageManager.LanguageList.Items[cboLanguage.ItemIndex]).Styles.Items[lstStyles.ItemIndex]).FontName := cboFont.Selected; end; -procedure TfrmSettings.cboFontChange(Sender: TObject); -begin - if (not chkUseDefaultFont.Checked) then - TSciStyle(TSciLangItem(frmMain.sciEditor.LanguageManager.LanguageList.Items[cboLanguage.ItemIndex]).Styles.Items[lstStyles.ItemIndex]).FontName := cboFont.Selected; -end; - procedure TfrmSettings.chkBoldClick(Sender: TObject); begin if chkBold.Checked then @@ -979,4 +973,10 @@ begin end; end; +procedure TfrmSettings.cboFontChange(Sender: TObject); +begin + if (not chkUseDefaultFont.Checked) then + TSciStyle(TSciLangItem(frmMain.sciEditor.LanguageManager.LanguageList.Items[cboLanguage.ItemIndex]).Styles.Items[lstStyles.ItemIndex]).FontName := cboFont.Text; +end; + end.