diff --git a/editor/studio/AMXX_Studio.dof b/editor/studio/AMXX_Studio.dof index 6fb3b4fa..b612c0e9 100755 --- a/editor/studio/AMXX_Studio.dof +++ b/editor/studio/AMXX_Studio.dof @@ -115,7 +115,7 @@ AutoIncBuild=1 MajorVer=1 MinorVer=3 Release=0 -Build=16 +Build=17 Debug=0 PreRelease=0 Special=0 @@ -126,7 +126,7 @@ CodePage=1252 [Version Info Keys] CompanyName=AMX Mod X Dev Team FileDescription= -FileVersion=1.3.0.16 +FileVersion=1.3.0.17 InternalName= LegalCopyright= LegalTrademarks= diff --git a/editor/studio/AMXX_Studio.exe b/editor/studio/AMXX_Studio.exe index e2ec3e73..a3b93755 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 207f86a4..62e3568f 100755 Binary files a/editor/studio/AMXX_Studio.res and b/editor/studio/AMXX_Studio.res differ diff --git a/editor/studio/UnitCompile.pas b/editor/studio/UnitCompile.pas index bc1f803e..8973b72b 100755 --- a/editor/studio/UnitCompile.pas +++ b/editor/studio/UnitCompile.pas @@ -145,7 +145,6 @@ var i, eIndex: integer; begin if Output.Count > 1 then begin eIndex := frmMain.lstOutput.ItemIndex; - frmMain.lstOutput.Items.BeginUpdate; frmMain.lstOutput.Items.Clear; if Finished then begin for i := 0 to Output.Count -1 do @@ -155,7 +154,6 @@ begin for i := 0 to Output.Count -2 do ProcessItem(Output[i]); end; - frmMain.lstOutput.Items.EndUpdate; frmMain.lstOutput.ItemIndex := eIndex; frmMain.Repaint; Application.ProcessMessages; diff --git a/editor/studio/UnitfrmMain.pas b/editor/studio/UnitfrmMain.pas index 1f0697ee..655e7af9 100755 --- a/editor/studio/UnitfrmMain.pas +++ b/editor/studio/UnitfrmMain.pas @@ -1919,6 +1919,7 @@ begin except Screen.Cursor := crDefault; MessageBox(Handle, PChar(lFailedUpdatePluginsIni), PChar(Application.Title), MB_ICONERROR); + exit; end; eFound := False; @@ -1953,6 +1954,7 @@ begin except Screen.Cursor := crDefault; MessageBox(Handle, PChar(lFailedUpdatePluginsIni), PChar(Application.Title), MB_ICONERROR); + exit; end; Screen.Cursor := crDefault; end; diff --git a/editor/studio/UnitfrmSettings.dfm b/editor/studio/UnitfrmSettings.dfm index dc08a471..f0df2fca 100755 --- a/editor/studio/UnitfrmSettings.dfm +++ b/editor/studio/UnitfrmSettings.dfm @@ -61,7 +61,7 @@ object frmSettings: TfrmSettings Top = 0 Width = 353 Height = 260 - ActivePage = jspCTSettings + ActivePage = jspFTP PropagateEnable = False Align = alClient OnChange = jplSettingsChange @@ -107,7 +107,7 @@ object frmSettings: TfrmSettings Height = 21 Style = csDropDownList Color = clWindow - ItemHeight = 13 + ItemHeight = 0 TabOrder = 0 ItemIndex = -1 OnChange = cboLanguageChange @@ -1077,21 +1077,21 @@ object frmSettings: TfrmSettings Caption = 'Settings' object lblFTPData: TLabel Left = 8 - Top = 6 + Top = 26 Width = 48 Height = 13 Caption = 'FTP Data:' end object lblDefaultDirectory: TLabel - Left = 10 - Top = 94 + Left = 8 + Top = 108 Width = 282 Height = 13 Caption = 'Plesae select the AMX Mod X directory on your FTP server:' end object pnlFTPData: TPanel Left = 6 - Top = 22 + Top = 42 Width = 339 Height = 63 BevelOuter = bvLowered @@ -1186,30 +1186,30 @@ object frmSettings: TfrmSettings end object pnlDefaultPath: TPanel Left = 8 - Top = 110 + Top = 124 Width = 339 - Height = 119 + Height = 105 BevelOuter = bvLowered TabOrder = 1 object lblDefaultDir: TLabel Left = 4 - Top = 96 + Top = 84 Width = 104 Height = 13 Caption = 'AMX Mod X Directory:' end object pnlDirectory: TPanel Left = 4 - Top = 4 + Top = 6 Width = 331 - Height = 85 + Height = 71 BevelOuter = bvLowered TabOrder = 0 object trvDirectories: TTreeView Left = 1 Top = 1 Width = 329 - Height = 83 + Height = 69 Align = alClient BorderStyle = bsNone Images = ilImages @@ -1223,7 +1223,7 @@ object frmSettings: TfrmSettings end object txtDefaultDir: TFlatEdit Left = 112 - Top = 94 + Top = 82 Width = 223 Height = 19 ColorFlat = clWhite