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

Don't show preferences without lib table init 

Since we require lib tables for the kiface, we require them for
instantiating the kiface and won't show preferences without them

Fixes https://gitlab.com/kicad/code/kicad/-/issues/16611
This commit is contained in:
Seth Hillbrand 2024-01-16 09:17:28 -08:00
parent 7001c4e351
commit a044ca8d4d
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
common/eda_base_frame.cpp
View File

@ -55,6 +55,7 @@
#include <tool/tool_dispatcher.h> #include <tool/tool_dispatcher.h>
#include <trace_helpers.h> #include <trace_helpers.h>
#include <widgets/paged_dialog.h> #include <widgets/paged_dialog.h>
#include <widgets/wx_busy_indicator.h>
#include <widgets/wx_infobar.h> #include <widgets/wx_infobar.h>
#include <widgets/wx_aui_art_providers.h> #include <widgets/wx_aui_art_providers.h>
#include <widgets/wx_grid.h> #include <widgets/wx_grid.h>
@ -1050,7 +1051,7 @@ void EDA_BASE_FRAME::OnPreferences( wxCommandEvent& event )
void EDA_BASE_FRAME::ShowPreferences( wxString aStartPage, wxString aStartParentPage ) void EDA_BASE_FRAME::ShowPreferences( wxString aStartPage, wxString aStartParentPage )
{ {
wxBeginBusyCursor( wxHOURGLASS_CURSOR ); WX_BUSY_INDICATOR busy_cursor;
PAGED_DIALOG dlg( this, _( "Preferences" ), true, true, wxEmptyString, wxSize( 980, 560 ) ); PAGED_DIALOG dlg( this, _( "Preferences" ), true, true, wxEmptyString, wxSize( 980, 560 ) );
@ -1107,6 +1108,9 @@ if( ADVANCED_CFG::GetCfg().m_EnableGit && false )
{ {
kiface = Kiway().KiFACE( KIWAY::FACE_SCH ); kiface = Kiway().KiFACE( KIWAY::FACE_SCH );
if( !kiface )
return;
kiface->GetActions( hotkeysPanel->ActionsList() ); kiface->GetActions( hotkeysPanel->ActionsList() );
if( GetFrameType() == FRAME_SCH_SYMBOL_EDITOR ) if( GetFrameType() == FRAME_SCH_SYMBOL_EDITOR )
@ -1137,6 +1141,9 @@ if( ADVANCED_CFG::GetCfg().m_EnableGit && false )
{ {
kiface = Kiway().KiFACE( KIWAY::FACE_PCB ); kiface = Kiway().KiFACE( KIWAY::FACE_PCB );
if( !kiface )
return;
kiface->GetActions( hotkeysPanel->ActionsList() ); kiface->GetActions( hotkeysPanel->ActionsList() );
if( GetFrameType() == FRAME_FOOTPRINT_EDITOR ) if( GetFrameType() == FRAME_FOOTPRINT_EDITOR )
@ -1177,6 +1184,9 @@ if( ADVANCED_CFG::GetCfg().m_EnableGit && false )
{ {
kiface = Kiway().KiFACE( KIWAY::FACE_GERBVIEW ); kiface = Kiway().KiFACE( KIWAY::FACE_GERBVIEW );
if( !kiface )
return;
kiface->GetActions( hotkeysPanel->ActionsList() ); kiface->GetActions( hotkeysPanel->ActionsList() );
if( GetFrameType() == FRAME_GERBER ) if( GetFrameType() == FRAME_GERBER )
@ -1194,6 +1204,10 @@ if( ADVANCED_CFG::GetCfg().m_EnableGit && false )
try try
{ {
kiface = Kiway().KiFACE( KIWAY::FACE_PL_EDITOR ); kiface = Kiway().KiFACE( KIWAY::FACE_PL_EDITOR );
if( !kiface )
return;
kiface->GetActions( hotkeysPanel->ActionsList() ); kiface->GetActions( hotkeysPanel->ActionsList() );
if( GetFrameType() == FRAME_PL_EDITOR ) if( GetFrameType() == FRAME_PL_EDITOR )
@ -1228,7 +1242,6 @@ if( ADVANCED_CFG::GetCfg().m_EnableGit && false )
dlg.SetInitialPage( aStartPage, aStartParentPage ); dlg.SetInitialPage( aStartPage, aStartParentPage );
dlg.SetEvtHandlerEnabled( true ); dlg.SetEvtHandlerEnabled( true );
wxEndBusyCursor();
if( dlg.ShowModal() == wxID_OK ) if( dlg.ShowModal() == wxID_OK )
{ {