Fix crash launching editors with additional command line arguments

(cherry picked from commit c5cdff6213)
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

View File

@ -195,22 +195,22 @@ int ExecuteFile( const wxString& aEditorName, const wxString& aFileName, wxProce
if( wxFileExists( fullEditorName ) )
{
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() )
{
for( const wxString& p : params )
args[i++] = p.wc_str();
args.emplace_back( p.wc_str() );
}
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;