From 89e78c0276e209f8a0da46a00c6a718fac09dd7f Mon Sep 17 00:00:00 2001
From: Jeff Young <jeff@rokeby.ie>
Date: Mon, 3 Apr 2023 23:43:55 +0100
Subject: [PATCH] Fix Mac crash-on-quit when timed infobar is up.

(cherry picked from commit b3e2cf218fa424ac4c52a4c70321294afb4126aa)
---
 common/eda_base_frame.cpp     | 4 ++++
 common/widgets/wx_infobar.cpp | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/common/eda_base_frame.cpp b/common/eda_base_frame.cpp
index 94946c9ab2..915558494d 100644
--- a/common/eda_base_frame.cpp
+++ b/common/eda_base_frame.cpp
@@ -219,6 +219,10 @@ void EDA_BASE_FRAME::windowClosing( wxCloseEvent& event )
     if( canCloseWindow( event ) )
     {
         m_isClosing = true;
+
+        if( m_infoBar )
+            m_infoBar->Dismiss();
+
         APP_SETTINGS_BASE* cfg = config();
 
         if( cfg )
diff --git a/common/widgets/wx_infobar.cpp b/common/widgets/wx_infobar.cpp
index c8916f3b9f..c8f0cfb20b 100644
--- a/common/widgets/wx_infobar.cpp
+++ b/common/widgets/wx_infobar.cpp
@@ -63,7 +63,7 @@ WX_INFOBAR::WX_INFOBAR( wxWindow* aParent, wxAuiManager* aMgr, wxWindowID aWinid
 
     // Infobar is broken on Mac without the effects
     SetShowHideEffects( wxSHOW_EFFECT_ROLL_TO_BOTTOM, wxSHOW_EFFECT_ROLL_TO_TOP );
-    SetEffectDuration( 300 );
+    SetEffectDuration( 200 );
 #else
     // Infobar freezes canvas on Windows with the effect, and GTK looks bad with it
     SetShowHideEffects( wxSHOW_EFFECT_NONE, wxSHOW_EFFECT_NONE );