haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Mac crash-on-quit when timed infobar is up. 

(cherry picked from commit b3e2cf218f)
This commit is contained in:
Jeff Young 2023-04-03 23:43:55 +01:00
parent 9a57c11348
commit 89e78c0276
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/eda_base_frame.cpp
View File

@ -219,6 +219,10 @@ void EDA_BASE_FRAME::windowClosing( wxCloseEvent& event )
if( canCloseWindow( event ) ) if( canCloseWindow( event ) )
{ {
m_isClosing = true; m_isClosing = true;
if( m_infoBar )
m_infoBar->Dismiss();
APP_SETTINGS_BASE* cfg = config(); APP_SETTINGS_BASE* cfg = config();
if( cfg ) if( cfg )

2
common/widgets/wx_infobar.cpp
View File

@ -63,7 +63,7 @@ WX_INFOBAR::WX_INFOBAR( wxWindow* aParent, wxAuiManager* aMgr, wxWindowID aWinid
// Infobar is broken on Mac without the effects // Infobar is broken on Mac without the effects
SetShowHideEffects( wxSHOW_EFFECT_ROLL_TO_BOTTOM, wxSHOW_EFFECT_ROLL_TO_TOP ); SetShowHideEffects( wxSHOW_EFFECT_ROLL_TO_BOTTOM, wxSHOW_EFFECT_ROLL_TO_TOP );
SetEffectDuration( 300 ); SetEffectDuration( 200 );
#else #else
// Infobar freezes canvas on Windows with the effect, and GTK looks bad with it // Infobar freezes canvas on Windows with the effect, and GTK looks bad with it
SetShowHideEffects( wxSHOW_EFFECT_NONE, wxSHOW_EFFECT_NONE ); SetShowHideEffects( wxSHOW_EFFECT_NONE, wxSHOW_EFFECT_NONE );