paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-09-04 20:00:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Qt: fixed segfault inside setPopupParent.related to issue #29247

Browse Source 
git-svn-id: trunk@51019 -
This commit is contained in:
zeljko 2015-12-24 09:02:36 +00:00
parent 93d8895785
commit bbb3a9aa1d
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lcl/interfaces/qt/qtwsforms.pp
View File

@ -191,7 +191,7 @@ begin
not (csDesigning in AForm.ComponentState)) not (csDesigning in AForm.ComponentState))
{$endif} then {$endif} then
QtMainWindow.setShowInTaskBar(False); QtMainWindow.setShowInTaskBar(False);
if Assigned(AForm.PopupParent) then if Assigned(AForm.PopupParent) and AForm.PopupParent.HandleAllocated then
PopupParent := TQtWidget(AForm.PopupParent.Handle).Widget PopupParent := TQtWidget(AForm.PopupParent.Handle).Widget
else else
PopupParent := nil; PopupParent := nil;
@ -334,7 +334,9 @@ class procedure TQtWSCustomForm.SetPopupParent(const ACustomForm: TCustomForm;
var var
PopupParent: QWidgetH; PopupParent: QWidgetH;
begin begin
if Assigned(APopupParent) then if not ACustomForm.HandleAllocated or (csDestroying in ACustomForm.ComponentState) then
exit;
if Assigned(APopupParent) and APopupParent.HandleAllocated then
PopupParent := TQtWidget(APopupParent.Handle).Widget PopupParent := TQtWidget(APopupParent.Handle).Widget
else else
PopupParent := nil; PopupParent := nil;