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

python version check: fix error message edge case

This commit is contained in:
Stefan 2023-01-02 20:20:01 +00:00 committed by Jon Evans
parent f4bce6079c
commit 2449f209b1
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
scripting/python_scripting.cpp
View File

@ -115,18 +115,20 @@ except:
"Python plugins will not be available." ) ); "Python plugins will not be available." ) );
available = false; available = false;
} }
else
version = version.Mid( idx + 10 );
wxVersionInfo wxVI = wxGetLibraryVersionInfo();
wxString wxVersion = wxString::Format( wxT( "%d.%d.%d" ),
wxVI.GetMajor(), wxVI.GetMinor(), wxVI.GetMicro() );
if( wxVersion.Cmp( version ) != 0 )
{ {
wxString msg = wxT( "The wxPython library was compiled against wxWidgets %s but KiCad is " wxVersionInfo wxVI = wxGetLibraryVersionInfo();
"using %s. Python plugins will not be available." ); wxString wxVersion = wxString::Format( wxT( "%d.%d.%d" ),
wxLogError( wxString::Format( msg, version, wxVersion ) ); wxVI.GetMajor(), wxVI.GetMinor(), wxVI.GetMicro() );
available = false; version = version.Mid( idx + 10 );
if( wxVersion.Cmp( version ) != 0 )
{
wxString msg = wxT( "The wxPython library was compiled against wxWidgets %s but KiCad is "
"using %s. Python plugins will not be available." );
wxLogError( wxString::Format( msg, version, wxVersion ) );
available = false;
}
} }
run = true; run = true;