diff --git a/editor/studio/AMXX_Studio.dof b/editor/studio/AMXX_Studio.dof index a2a5f7fc..950d3ab7 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=25 +Build=26 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.25 +FileVersion=1.3.0.26 InternalName= LegalCopyright= LegalTrademarks= diff --git a/editor/studio/AMXX_Studio.exe b/editor/studio/AMXX_Studio.exe index 3ddc91fa..32e210bb 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 3ffa0bbd..418f80ea 100755 Binary files a/editor/studio/AMXX_Studio.res and b/editor/studio/AMXX_Studio.res differ diff --git a/editor/studio/UnitMainTools.pas b/editor/studio/UnitMainTools.pas index 012800b2..f54e0a45 100755 --- a/editor/studio/UnitMainTools.pas +++ b/editor/studio/UnitMainTools.pas @@ -579,7 +579,6 @@ begin Started := False; // dont run this command twice frmMain.tsMain.Items[Index].Checked := True; // select tab CurrProjects := Index; - Started := True; tsDocuments.Items.Clear; for i := 0 to Collection.Count -1 do begin @@ -588,6 +587,7 @@ begin TabItem.OnSelect := frmMain.OnTabSelect; tsDocuments.Items.Add(TabItem); end; + Started := True; if JumpToLastDoc then begin Started := False; diff --git a/editor/studio/UnitfrmMOTDGen.pas b/editor/studio/UnitfrmMOTDGen.pas index 4e6cc01e..2f4a354e 100755 --- a/editor/studio/UnitfrmMOTDGen.pas +++ b/editor/studio/UnitfrmMOTDGen.pas @@ -3,7 +3,7 @@ unit UnitfrmMOTDGen; interface uses - SysUtils, Windows, Messages, Classes, Graphics, Controls, + SysUtils, Windows, Messages, Classes, Graphics, Controls, ClipBrd, StdCtrls, ExtCtrls, Forms, mxFlatControls, TBXDkPanels, SpTBXDkPanels; type @@ -23,8 +23,7 @@ implementation procedure TfrmMOTDGen.cmdCopyClick(Sender: TObject); begin - txtMOTD.CopyToClipboard; - txtMOTD.CopyToClipboard; + Clipboard.SetTextBuf(txtMOTD.Lines.GetText); end; end. diff --git a/editor/studio/UnitfrmMain.pas b/editor/studio/UnitfrmMain.pas index 88e6b7de..851b1b79 100755 --- a/editor/studio/UnitfrmMain.pas +++ b/editor/studio/UnitfrmMain.pas @@ -690,7 +690,7 @@ begin case tsMain.ActiveTabIndex of 0: Collection := PawnProjects; // Pawn 1: Collection := CPPProjects; // C++ - else Collection := OtherProjects; // Other + else Collection := OtherProjects; // Other end; Collection.Activate(ItemIndex, True); end; @@ -869,7 +869,7 @@ begin if not Plugin_CreateNewFile(NEW_OTHER_HTML, True) then exit; if tsMain.ActiveTabIndex <> 2 then - ActivateProjects(2, False); + ActivateProjects(2, True); OtherProjects.Activate(OtherProjects.Add('', 'HTML'), True); sciEditor.Lines.Add(''); @@ -1984,8 +1984,13 @@ begin if (GetCurrLang.Name = 'HTML') then begin eStr := TStringList.Create; eStr.Text := StringReplace(sciEditor.Lines.Text, #9, '', [rfReplaceAll]); - for i := 0 to eStr.Count - 1 do - eStr[i] := '"' + eStr[i] + '\n" +'; + eStr.Text := StringReplace(sciEditor.Lines.Text, '"', '^"', [rfReplaceAll]); + for i := 0 to eStr.Count -1 do begin + if i = eStr.Count -1 then + eStr[i] := '"' + eStr[i] + '"' + else + eStr[i] := '"' + eStr[i] + '^n" +'; + end; frmMOTDGen.txtMOTD.Lines.Assign(eStr); eStr.Destroy;