realAscot/kicad-source
1
0
Fork 0
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-09-15 10:43:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash launching editors with additional command line arguments

Browse Source 
(cherry picked from commit c5cdff6213ed8d51b5861fe25ee60eefa82bdee7)
This commit is contained in:
Jon Evans 2023-12-04 12:22:16 -05:00
parent 3bd7d92522
commit fc3c701fa1
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
common/gestfich.cpp
View File

@ -195,22 +195,22 @@ int ExecuteFile( const wxString& aEditorName, const wxString& aFileName, wxProce
if( wxFileExists( fullEditorName ) ) if( wxFileExists( fullEditorName ) )
{ {
int i = 0; int i = 0;
const wchar_t* args[4]; std::vector<const wchar_t*> args;
args[i++] = fullEditorName.wc_str(); args.emplace_back( fullEditorName.wc_str() );
if( !params.empty() ) if( !params.empty() )
{ {
for( const wxString& p : params ) for( const wxString& p : params )
args[i++] = p.wc_str(); args.emplace_back( p.wc_str() );
} }
if( !aFileName.IsEmpty() ) if( !aFileName.IsEmpty() )
args[i++] = aFileName.wc_str(); args.emplace_back( aFileName.wc_str() );
args[i] = nullptr; args.emplace_back( nullptr );
return wxExecute( const_cast<wchar_t**>( args ), wxEXEC_ASYNC, aCallback ); return wxExecute( const_cast<wchar_t**>( args.data() ), wxEXEC_ASYNC, aCallback );
} }
wxString msg; wxString msg;