Fix issues related to the splash screen when no config file found:
- do not show it before the application is actually started. - hide the splash screen before displaying dialogs. Fixes #15047 https://gitlab.com/kicad/code/kicad/-/issues/15047
This commit is contained in:
parent
b3d7aea4df
commit
1094cc5331
|
@ -506,9 +506,6 @@ bool PGM_BASE::InitPgm( bool aHeadless, bool aSkipPyInit, bool aIsUnitTest )
|
|||
SetLanguagePath();
|
||||
SetDefaultLanguage( tmp );
|
||||
|
||||
if( !aHeadless )
|
||||
ShowSplash();
|
||||
|
||||
m_settings_manager = std::make_unique<SETTINGS_MANAGER>( aHeadless );
|
||||
|
||||
// Our unit test mocks break if we continue
|
||||
|
@ -566,6 +563,10 @@ bool PGM_BASE::InitPgm( bool aHeadless, bool aSkipPyInit, bool aIsUnitTest )
|
|||
if( ADVANCED_CFG::GetCfg().m_UpdateUIEventInterval != 0 )
|
||||
wxUpdateUIEvent::SetUpdateInterval( ADVANCED_CFG::GetCfg().m_UpdateUIEventInterval );
|
||||
|
||||
// Now the application can safely start, show the splash screen
|
||||
if( !aHeadless )
|
||||
ShowSplash();
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
|
@ -370,6 +370,9 @@ bool IFACE::loadGlobalLibTable()
|
|||
{
|
||||
if( !( m_start_flags & KFCTL_CLI ) )
|
||||
{
|
||||
// Ensure the splash screen does not hide the dialog:
|
||||
Pgm().HideSplash();
|
||||
|
||||
DIALOG_GLOBAL_SYM_LIB_TABLE_CONFIG symDialog( nullptr );
|
||||
|
||||
if( symDialog.ShowModal() != wxID_OK )
|
||||
|
|
|
@ -385,6 +385,9 @@ bool IFACE::loadGlobalLibTable()
|
|||
{
|
||||
if( !( m_start_flags & KFCTL_CLI ) )
|
||||
{
|
||||
// Ensure the splash screen does not hide the dialog:
|
||||
Pgm().HideSplash();
|
||||
|
||||
DIALOG_GLOBAL_FP_LIB_TABLE_CONFIG fpDialog( nullptr );
|
||||
|
||||
if( fpDialog.ShowModal() != wxID_OK )
|
||||
|
|
Loading…
Reference in New Issue