From e71fd48c38a09e00b2af764c9350b8aa4a8661ef Mon Sep 17 00:00:00 2001 From: mattias Date: Sun, 4 Aug 2013 07:50:58 +0000 Subject: [PATCH] IDE: select frame: fixed crash if form has no owner git-svn-id: trunk@42300 - --- ide/allcompileroptions.lfm | 30 +++++++++++++++--------------- ide/main.pp | 3 ++- 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/ide/allcompileroptions.lfm b/ide/allcompileroptions.lfm index b4fab904ca..1f9f1454c7 100644 --- a/ide/allcompileroptions.lfm +++ b/ide/allcompileroptions.lfm @@ -1,7 +1,7 @@ object frmAllCompilerOptions: TfrmAllCompilerOptions - Left = 338 + Left = 311 Height = 497 - Top = 112 + Top = 189 Width = 622 Caption = 'frmAllCompilerOptions' ClientHeight = 497 @@ -40,15 +40,15 @@ object frmAllCompilerOptions: TfrmAllCompilerOptions AnchorSideRight.Side = asrBottom AnchorSideBottom.Control = ButtonPanel1 Left = 0 - Height = 419 + Height = 424 Top = 25 Width = 616 HorzScrollBar.Increment = 61 - HorzScrollBar.Page = 612 + HorzScrollBar.Page = 614 HorzScrollBar.Smooth = True HorzScrollBar.Tracking = True - VertScrollBar.Increment = 41 - VertScrollBar.Page = 415 + VertScrollBar.Increment = 42 + VertScrollBar.Page = 422 VertScrollBar.Smooth = True VertScrollBar.Tracking = True Anchors = [akTop, akLeft, akRight, akBottom] @@ -58,8 +58,8 @@ object frmAllCompilerOptions: TfrmAllCompilerOptions end object ButtonPanel1: TButtonPanel Left = 6 - Height = 41 - Top = 450 + Height = 36 + Top = 455 Width = 610 OKButton.Name = 'OKButton' OKButton.DefaultCaption = True @@ -78,9 +78,9 @@ object frmAllCompilerOptions: TfrmAllCompilerOptions AnchorSideTop.Control = btnResetOptionsFilter AnchorSideTop.Side = asrCenter Left = 156 - Height = 21 - Top = 2 - Width = 143 + Height = 24 + Top = 0 + Width = 133 BorderSpacing.Left = 29 Caption = 'Show only modified' OnClick = cbShowModifiedClick @@ -90,10 +90,10 @@ object frmAllCompilerOptions: TfrmAllCompilerOptions AnchorSideLeft.Control = cbShowModified AnchorSideLeft.Side = asrBottom AnchorSideTop.Control = cbShowModified - Left = 328 - Height = 21 - Top = 2 - Width = 233 + Left = 318 + Height = 24 + Top = 0 + Width = 206 BorderSpacing.Left = 29 Caption = 'Use comments in custom options' TabOrder = 4 diff --git a/ide/main.pp b/ide/main.pp index bcf57f1c1b..a0334d978e 100644 --- a/ide/main.pp +++ b/ide/main.pp @@ -5810,7 +5810,8 @@ begin // add package units FirstDependency:=APackage.FirstRequiredDependency; AddPackage(APackage); - end; + end else + FirstDependency:=nil; // add all units of all used packages PackageGraph.GetAllRequiredPackages(nil,FirstDependency,PkgList); if PkgList<>nil then