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

Fix "Error loading editor" when no 3Dconnexion driver installed.

This commit is contained in:
markus-bonk 2021-07-02 11:29:22 +02:00 committed by Wayne Stambaugh
parent b9a27a8fab
commit 91d261d735
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
3d-viewer/3d_viewer/eda_3d_viewer_frame.cpp
View File

@ -157,7 +157,14 @@ EDA_3D_VIEWER_FRAME::EDA_3D_VIEWER_FRAME( KIWAY* aKiway, PCB_BASE_FRAME* aParent
m_canvas->SetStatusBar( status_bar ); m_canvas->SetStatusBar( status_bar );
#if defined( KICAD_USE_3DCONNEXION ) #if defined( KICAD_USE_3DCONNEXION )
m_spaceMouse = new NL_3D_VIEWER_PLUGIN( m_canvas ); try
{
m_spaceMouse = new NL_3D_VIEWER_PLUGIN( m_canvas );
}
catch( const std::system_error& e )
{
wxLogTrace( wxT( "KI_TRACE_NAVLIB" ), e.what() );
}
#endif #endif
// Fixes bug in Windows (XP and possibly others) where the canvas requires the focus // Fixes bug in Windows (XP and possibly others) where the canvas requires the focus

9
pcbnew/pcb_edit_frame.cpp
View File

@ -373,7 +373,14 @@ PCB_EDIT_FRAME::PCB_EDIT_FRAME( KIWAY* aKiway, wxWindow* aParent ) :
// GetMenuBar()->FindItem( ID_GEN_EXPORT_FILE_STEP )->Enable( false ); // GetMenuBar()->FindItem( ID_GEN_EXPORT_FILE_STEP )->Enable( false );
#if defined( KICAD_USE_3DCONNEXION ) #if defined( KICAD_USE_3DCONNEXION )
m_spaceMouse = new NL_PCBNEW_PLUGIN( canvas ); try
{
m_spaceMouse = new NL_PCBNEW_PLUGIN( canvas );
}
catch( const std::system_error& e )
{
wxLogTrace( wxT( "KI_TRACE_NAVLIB" ), e.what() );
}
#endif #endif
// AUI doesn't refresh properly on wxMac after changes in eb7dc6dd, so force it to // AUI doesn't refresh properly on wxMac after changes in eb7dc6dd, so force it to