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

Eeschema: fix broken complex hierarchy loading on Windows 

The full filename comparison to detect the reuse of a file was broken on Windows
because it mixed a native filename notation (containing the drive id),
and a unix notation (no drive in filename, different separator).
This commit is contained in:
jean-pierre charras 2019-07-09 17:09:03 +02:00
parent 36f1d023f0
commit 8bb3fae5ae
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
eeschema/sch_legacy_plugin.cpp
View File

@ -670,7 +670,7 @@ void SCH_LEGACY_PLUGIN::loadHierarchy( SCH_SHEET* aSheet )
wxLogTrace( traceSchLegacyPlugin, "Current path \"%s\"", m_currentPath.top() );
wxLogTrace( traceSchLegacyPlugin, "Loading \"%s\"", fileName.GetFullPath() );
m_rootSheet->SearchHierarchy( fileName.GetFullPath( wxPATH_UNIX ), &screen );
m_rootSheet->SearchHierarchy( fileName.GetFullPath(), &screen );
if( screen )
{

2
eeschema/sch_sheet.h
View File

@ -418,7 +418,7 @@ public:
/**
* Search the existing hierarchy for an instance of screen loaded from \a aFileName.
*
* @param aFilename = the filename to find (MUST be absolute, and in wxPATH_UNIX encoding)
* @param aFilename = the filename to find (MUST be absolute, and in wxPATH_NATIVE encoding)
* @param aScreen = a location to return a pointer to the screen (if found)
* @return bool if found, and a pointer to the screen
*/