AllSpiceMirrors/kicad
7
Fork 0
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-04-21 23:23:47 +00:00
Files Issues Releases Activity

ReparentModal: fix case when parent is not available

Browse Source 
In some situations then parent window couldn't be available. Eg, when
eeschema is executed as standalone on macOS and trying to show
the global design block table dialog before the main frame exists.
So replace the assert with return and check the windows pointers bellow.
This commit is contained in:
Andrej Valek 2024-10-31 14:42:53 +01:00
parent 59759b325f
commit 20ee4effdc
1 changed files with 9 additions and 2 deletions

11
libs/kiplatform/port/wxosx/ui.mm
View File

@ -81,12 +81,19 @@ void KIPLATFORM::UI::ReparentModal( wxNonOwnedWindow* aWindow )
wxTopLevelWindow* parent =
static_cast<wxTopLevelWindow*>( wxGetTopLevelParent( aWindow->GetParent() ) );
wxASSERT_MSG(parent, wxT( "Modal windows require a parent.") );
// Quietly return if no parent is found
if( !parent )
{
return;
}
NSWindow* parentWindow = parent->GetWXWindow();
NSWindow* theWindow = aWindow->GetWXWindow();
[parentWindow addChildWindow:theWindow ordered:NSWindowAbove];
if( parentWindow && theWindow )
{
[parentWindow addChildWindow:theWindow ordered:NSWindowAbove];
}
}