From 3d57de91e8c7918e050f353f5280724e0ffd301a Mon Sep 17 00:00:00 2001
From: jean-pierre charras <jp.charras@wanadoo.fr>
Date: Sun, 20 Dec 2020 14:30:25 +0100
Subject: [PATCH] SCH_SHEET::SearchHierarchy(): fix an issue when comparing
 file names. We are using the unix separator in filenames in all platforms.
 However on Windows some filenames can contain native separators. We now
 ensure all filenames use the unix separator before comparison.

Fix #6742
---
 eeschema/sch_sheet.cpp | 31 ++++++++++++++++++++++++-------
 1 file changed, 24 insertions(+), 7 deletions(-)

diff --git a/eeschema/sch_sheet.cpp b/eeschema/sch_sheet.cpp
index f3ca1b5d9b..4ce8219be7 100644
--- a/eeschema/sch_sheet.cpp
+++ b/eeschema/sch_sheet.cpp
@@ -599,6 +599,11 @@ bool SCH_SHEET::SearchHierarchy( const wxString& aFilename, SCH_SCREEN** aScreen
     SCH_SHEET*  sheet = nullptr;
     SCH_SCREEN* screen = nullptr;
 
+    // Ensure separators used in all filenames use the same symbol. We use the unix separator
+    // in sch files, but if the filename is entered by a dialog on Windows the separator can differ
+    wxString filename =  aFilename;
+    filename.Replace( '\\', '/' );
+
     if( m_screen )
     {
         // Only check the root sheet once and don't recurse.
@@ -607,10 +612,16 @@ bool SCH_SHEET::SearchHierarchy( const wxString& aFilename, SCH_SCREEN** aScreen
             sheet = this;
             screen = m_screen;
 
-            if( screen && screen->GetFileName().Cmp( aFilename ) == 0 )
+            if( screen )
             {
-                *aScreen = screen;
-                return true;
+                wxString curr_fn = screen->GetFileName();
+                curr_fn.Replace( '\\', '/' );   // use unix separator
+
+                if( curr_fn.Cmp( filename ) == 0 )
+                {
+                    *aScreen = screen;
+                    return true;
+                }
             }
         }
 
@@ -625,10 +636,16 @@ bool SCH_SHEET::SearchHierarchy( const wxString& aFilename, SCH_SCREEN** aScreen
                 sheet = static_cast< SCH_SHEET* >( item );
                 screen = sheet->m_screen;
 
-                if( screen && screen->GetFileName().Cmp( aFilename ) == 0 )
-                {
-                    *aScreen = sheet->m_screen;
-                    return true;
+                if( screen )
+               {
+                    wxString curr_fn = screen->GetFileName();
+                    curr_fn.Replace( '\\', '/' );   // use unix separator
+
+                    if( curr_fn.Cmp( filename ) == 0 )
+                    {
+                        *aScreen = sheet->m_screen;
+                        return true;
+                    }
                 }
 
                 if( sheet->SearchHierarchy( aFilename, aScreen ) )