From 78b505f36a07ebe6461a8aab112676ceedf157a6 Mon Sep 17 00:00:00 2001
From: Jeff Young <jeff@rokeby.ie>
Date: Mon, 23 Nov 2020 23:54:34 +0000
Subject: [PATCH] Count head and tail lists as well.

Fixes https://gitlab.com/kicad/code/kicad/issues/6461
---
 common/dialogs/wx_html_report_panel.cpp     | 11 ++++++++---
 eeschema/dialogs/dialog_update_from_pcb.cpp |  8 +++++++-
 eeschema/tools/backannotate.cpp             |  1 +
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/common/dialogs/wx_html_report_panel.cpp b/common/dialogs/wx_html_report_panel.cpp
index d704e6021a..79cfb888da 100644
--- a/common/dialogs/wx_html_report_panel.cpp
+++ b/common/dialogs/wx_html_report_panel.cpp
@@ -158,9 +158,14 @@ int WX_HTML_REPORT_PANEL::Count( int severityMask )
 {
     int count = 0;
 
-    for( const REPORT_LINE& reportLine : m_report )
-        if( severityMask & reportLine.severity )
-            count++;
+    for( const auto& reportLineArray : { m_report, m_reportHead, m_reportTail } )
+    {
+        for( const REPORT_LINE& reportLine : reportLineArray )
+        {
+            if( severityMask & reportLine.severity )
+                count++;
+        }
+    }
 
     return count;
 }
diff --git a/eeschema/dialogs/dialog_update_from_pcb.cpp b/eeschema/dialogs/dialog_update_from_pcb.cpp
index 9b3a6a84db..e392ee1f3d 100644
--- a/eeschema/dialogs/dialog_update_from_pcb.cpp
+++ b/eeschema/dialogs/dialog_update_from_pcb.cpp
@@ -32,6 +32,7 @@
 DIALOG_UPDATE_FROM_PCB::DIALOG_UPDATE_FROM_PCB_SAVED_STATE
         DIALOG_UPDATE_FROM_PCB::s_savedDialogState{ true, true, true, true, false };
 
+
 DIALOG_UPDATE_FROM_PCB::DIALOG_UPDATE_FROM_PCB( SCH_EDIT_FRAME* aParent )
         : DIALOG_UPDATE_FROM_PCB_BASE( aParent ),
           m_frame( aParent ),
@@ -69,6 +70,7 @@ DIALOG_UPDATE_FROM_PCB::DIALOG_UPDATE_FROM_PCB( SCH_EDIT_FRAME* aParent )
     finishDialogSettings();
 }
 
+
 void DIALOG_UPDATE_FROM_PCB::updateData()
 {
     bool successfulRun = false;
@@ -90,16 +92,19 @@ void DIALOG_UPDATE_FROM_PCB::updateData()
     m_messagePanel->Flush( false );
 }
 
+
 bool DIALOG_UPDATE_FROM_PCB::TransferDataToWindow()
 {
     updateData();
     return true;
 }
 
+
 DIALOG_UPDATE_FROM_PCB::~DIALOG_UPDATE_FROM_PCB()
 {
 }
 
+
 void DIALOG_UPDATE_FROM_PCB::OnOptionChanged( wxCommandEvent& event )
 {
     if( event.GetEventObject() == m_cbRelinkFootprints )
@@ -130,6 +135,7 @@ void DIALOG_UPDATE_FROM_PCB::OnOptionChanged( wxCommandEvent& event )
         s_savedDialogState.UpdateNetNames = m_cbUpdateNetNames->GetValue();
 }
 
+
 void DIALOG_UPDATE_FROM_PCB::OnUpdateClick( wxCommandEvent& event )
 {
     std::string netlist;
@@ -155,5 +161,5 @@ void DIALOG_UPDATE_FROM_PCB::OnUpdateClick( wxCommandEvent& event )
             backAnno.PushNewLinksToPCB();
     }
 
-    m_messagePanel->Flush( true );
+    m_messagePanel->Flush( false );
 }
diff --git a/eeschema/tools/backannotate.cpp b/eeschema/tools/backannotate.cpp
index 11466d7a06..0b2244ed97 100644
--- a/eeschema/tools/backannotate.cpp
+++ b/eeschema/tools/backannotate.cpp
@@ -85,6 +85,7 @@ bool BACK_ANNOTATE::BackAnnotateSymbols( const std::string& aNetlist )
     return true;
 }
 
+
 bool BACK_ANNOTATE::FetchNetlistFromPCB( std::string& aNetlist )
 {
     if( Kiface().IsSingle() )