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

Fix the --version redirection 

Fixes https://gitlab.com/kicad/code/kicad/-/issues/13379
This commit is contained in:
Marek Roszko 2023-01-04 21:39:37 -05:00
parent 0c717ec4f2
commit c3a214983d
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
kicad/cli/command_version.cpp
View File

@ -38,6 +38,16 @@ CLI::VERSION_COMMAND::VERSION_COMMAND() : COMMAND( "version" )
int CLI::VERSION_COMMAND::doPerform( KIWAY& aKiway ) int CLI::VERSION_COMMAND::doPerform( KIWAY& aKiway )
{ {
if( !m_argParser )
{
// were we redirected from the --version?
// m_argParser override for bool() returns false if we didnt parse any args normally
// we need to exit here early because it'll exception in the later arg handling code if we dont
// no arg provided also ends up here on the version command
wxPrintf( "%s\n", GetMajorMinorPatchVersion() );
return EXIT_CODES::OK;
}
wxString format = FROM_UTF8( m_argParser.get<std::string>( ARG_FORMAT ).c_str() ); wxString format = FROM_UTF8( m_argParser.get<std::string>( ARG_FORMAT ).c_str() );
if( format == wxS( "plain" ) ) if( format == wxS( "plain" ) )
{ {
@ -58,5 +68,5 @@ int CLI::VERSION_COMMAND::doPerform( KIWAY& aKiway )
return EXIT_CODES::ERR_ARGS; return EXIT_CODES::ERR_ARGS;
} }
return 0; return EXIT_CODES::OK;
} }