From 08d56f897c21c8d9ee8369f0a8a4b9da1127ec07 Mon Sep 17 00:00:00 2001
From: Jeff Young <jeff@rokeby.ie>
Date: Sun, 13 Jun 2021 17:15:02 +0100
Subject: [PATCH] Update Hierarchy Navigator after performing file actions.

Fixes https://gitlab.com/kicad/code/kicad/issues/8498
---
 eeschema/files-io.cpp | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/eeschema/files-io.cpp b/eeschema/files-io.cpp
index 39374f6841..87fb7ad345 100644
--- a/eeschema/files-io.cpp
+++ b/eeschema/files-io.cpp
@@ -24,14 +24,12 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
  */
 
-#include <advanced_config.h>
 #include <class_library.h>
 #include <confirm.h>
 #include <connection_graph.h>
 #include <dialog_migrate_buses.h>
 #include <dialog_symbol_remap.h>
 #include <eeschema_settings.h>
-#include <gestfich.h>
 #include <id.h>
 #include <kiface_i.h>
 #include <kiplatform/app.h>
@@ -60,7 +58,6 @@
 #include <wx/ffile.h>
 #include <wx/filedlg.h>
 #include <wx/log.h>
-#include <tools/ee_actions.h>
 #include <tools/ee_inspection_tool.h>
 #include <paths.h>
 #include <wx_filename.h>  // For ::ResolvePossibleSymlinks
@@ -619,6 +616,7 @@ bool SCH_EDIT_FRAME::OpenProjectFiles( const std::vector<wxString>& aFileSet, in
     SyncView();
     GetScreen()->ClearDrawingState();
 
+    UpdateHierarchyNavigator();
     UpdateTitle();
 
     wxFileName fn = Prj().AbsolutePath( GetScreen()->GetFileName() );
@@ -670,6 +668,8 @@ bool SCH_EDIT_FRAME::AppendSchematic()
     OnModify();
     HardRedraw();   // Full reinit of the current screen and the display.
 
+    UpdateHierarchyNavigator();
+
     return true;
 }
 
@@ -1166,6 +1166,8 @@ bool SCH_EDIT_FRAME::importFile( const wxString& aFileName, int aFileType )
             initScreenZoom();
             SetSheetNumberAndCount();
             SyncView();
+
+            UpdateHierarchyNavigator();
             UpdateTitle();
         }
         catch( const IO_ERROR& ioe )