diff --git a/editor/studio/AMXX_Studio.dof b/editor/studio/AMXX_Studio.dof index d434245a..b56003e0 100755 --- a/editor/studio/AMXX_Studio.dof +++ b/editor/studio/AMXX_Studio.dof @@ -115,7 +115,7 @@ AutoIncBuild=1 MajorVer=1 MinorVer=4 Release=2 -Build=8 +Build=9 Debug=0 PreRelease=0 Special=0 @@ -126,7 +126,7 @@ CodePage=1252 [Version Info Keys] CompanyName=AMX Mod X Dev Team FileDescription= -FileVersion=1.4.2.8 +FileVersion=1.4.2.9 InternalName=gaben LegalCopyright=AMX Mod X Dev Team LegalTrademarks= diff --git a/editor/studio/AMXX_Studio.exe b/editor/studio/AMXX_Studio.exe index 4d8834f6..e79d45ac 100755 Binary files a/editor/studio/AMXX_Studio.exe and b/editor/studio/AMXX_Studio.exe differ diff --git a/editor/studio/AMXX_Studio.mes b/editor/studio/AMXX_Studio.mes index 1bfc6579..5acd03e2 100644 --- a/editor/studio/AMXX_Studio.mes +++ b/editor/studio/AMXX_Studio.mes @@ -55,7 +55,7 @@ DetailsBtnText=&Details PleaseWaitTitle=Information PleaseWaitText=Please wait a moment... MailSubject=bug report -MailBody=please find the bug report attached +MailBody=< report what you've done to raise this error > SendBoxTitle=Sending bug report... PrepareAttachMsg=Preparing attachments... MxLookupMsg=Searching for mail server... diff --git a/editor/studio/AMXX_Studio.res b/editor/studio/AMXX_Studio.res index 74518625..652f8d4b 100755 Binary files a/editor/studio/AMXX_Studio.res and b/editor/studio/AMXX_Studio.res differ diff --git a/editor/studio/UnitCodeExplorerUpdater.pas b/editor/studio/UnitCodeExplorerUpdater.pas index dd23ab8d..3ce068b4 100755 --- a/editor/studio/UnitCodeExplorerUpdater.pas +++ b/editor/studio/UnitCodeExplorerUpdater.pas @@ -125,8 +125,10 @@ end; procedure TCodeExplorerUpdater.GetCode; begin - eCode.Assign(frmMain.sciEditor.Lines); - eActive := ActiveDoc.Index; + if Assigned(ActiveDoc) then begin + eCode.Assign(frmMain.sciEditor.Lines); + eActive := ActiveDoc.Index; + end; end; function GetNode(eText: string): TTreeNode; diff --git a/editor/studio/UnitMainTools.pas b/editor/studio/UnitMainTools.pas index 8d47ae6b..88038abe 100755 --- a/editor/studio/UnitMainTools.pas +++ b/editor/studio/UnitMainTools.pas @@ -1082,19 +1082,13 @@ begin if ActiveDoc.Index = AIndex then ActiveDoc := nil; end; - Delete(AIndex); - for i := 0 to Count -1 do + + for i := 0 to Count -1 do begin TDocument(Items[i]).Title := '< ' + IntToStr(i +1) + #32 + ExtractFileName(TDocument(Items[i]).FileName) + ' >'; - - if (Collection = Self) then begin - try - for i := 0 to frmMain.tbDocs.Tabs.Count -1 do begin - TJvTabBarItem(frmMain.tbDocs.Tabs[i]).Caption := TDocument(Items[i]).Title; - TJvTabBarItem(frmMain.tbDocs.Tabs[i]).Modified := TDocument(Items[i]).Modified; - end; - except - // no idea how to fix this + if (Collection = Self) and (Started) then begin + TJvTabBarItem(frmMain.tbDocs.Tabs[i]).Caption := TDocument(Items[i]).Title; + TJvTabBarItem(frmMain.tbDocs.Tabs[i]).Modified := TDocument(Items[i]).Modified; end; end; diff --git a/editor/studio/UnitfrmMain.dfm b/editor/studio/UnitfrmMain.dfm index 178e068c..3baccfcc 100755 --- a/editor/studio/UnitfrmMain.dfm +++ b/editor/studio/UnitfrmMain.dfm @@ -729,6 +729,7 @@ object frmMain: TfrmMain Left = 0 Top = 72 Width = 880 + RightClickSelect = False Tabs = < item Caption = '< 1 Untitled.sma >' diff --git a/editor/studio/UnitfrmMain.pas b/editor/studio/UnitfrmMain.pas index 496f2aae..60dea6f8 100755 --- a/editor/studio/UnitfrmMain.pas +++ b/editor/studio/UnitfrmMain.pas @@ -419,6 +419,8 @@ begin pnlLoading.Top := tbDocs.Top + sciEditor.Top + ((sciEditor.Height * 5) div 6) - (pnlLoading.Height div 2); pnlLoading.BringToFront; + if not Assigned(ActiveDoc) then exit; + if (Canvas.TextWidth(ActiveDoc.FileName) + 10 > mnuFilename.CustomWidth) then mnuFilename.Caption := ExtractFileName(ActiveDoc.FileName) else @@ -3067,7 +3069,7 @@ begin if tbDocs.Tabs.IndexOf(Item) <> -1 then begin if CloseDocument(TDocument(Collection.Items[tbDocs.Tabs.IndexOf(Item)]), True, False) then - tbDocs.Tabs.Delete(tbDocs.Tabs.IndexOf(Item)); + tbDocs.Tabs.Delete(Item.Index); end; Screen.Cursor := crDefault; end;