From 91d261d735ff49f842db6f6b3da34fbdbb981eb6 Mon Sep 17 00:00:00 2001 From: markus-bonk Date: Fri, 2 Jul 2021 11:29:22 +0200 Subject: [PATCH] Fix "Error loading editor" when no 3Dconnexion driver installed. --- 3d-viewer/3d_viewer/eda_3d_viewer_frame.cpp | 9 ++++++++- pcbnew/pcb_edit_frame.cpp | 9 ++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/3d-viewer/3d_viewer/eda_3d_viewer_frame.cpp b/3d-viewer/3d_viewer/eda_3d_viewer_frame.cpp index d3dfef1483..17703d3007 100644 --- a/3d-viewer/3d_viewer/eda_3d_viewer_frame.cpp +++ b/3d-viewer/3d_viewer/eda_3d_viewer_frame.cpp @@ -157,7 +157,14 @@ EDA_3D_VIEWER_FRAME::EDA_3D_VIEWER_FRAME( KIWAY* aKiway, PCB_BASE_FRAME* aParent m_canvas->SetStatusBar( status_bar ); #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 // Fixes bug in Windows (XP and possibly others) where the canvas requires the focus diff --git a/pcbnew/pcb_edit_frame.cpp b/pcbnew/pcb_edit_frame.cpp index a9e1b65f71..943b8d4ed3 100644 --- a/pcbnew/pcb_edit_frame.cpp +++ b/pcbnew/pcb_edit_frame.cpp @@ -373,7 +373,14 @@ PCB_EDIT_FRAME::PCB_EDIT_FRAME( KIWAY* aKiway, wxWindow* aParent ) : // GetMenuBar()->FindItem( ID_GEN_EXPORT_FILE_STEP )->Enable( false ); #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 // AUI doesn't refresh properly on wxMac after changes in eb7dc6dd, so force it to