diff --git a/common/dialogs/wx_html_report_panel.cpp b/common/dialogs/wx_html_report_panel.cpp index 79cfb888da..3651dd5bcf 100644 --- a/common/dialogs/wx_html_report_panel.cpp +++ b/common/dialogs/wx_html_report_panel.cpp @@ -185,10 +185,10 @@ wxString WX_HTML_REPORT_PANEL::generateHtml( const REPORT_LINE& aLine ) "" + aLine.message + "
"; break; case RPT_SEVERITY_WARNING: - retv = "" + _( "Warning:" ) + wxS( " " )+ aLine.message + "
"; + retv = "" + _( "Warning:" ) + wxS( " " ) + aLine.message + "
"; break; case RPT_SEVERITY_INFO: - retv = "" + _( "Info:" ) + wxS( " " )+ aLine.message + "
"; + retv = "" + aLine.message + "
"; break; case RPT_SEVERITY_ACTION: retv = "" + aLine.message + "
"; diff --git a/pcbnew/netlist_reader/board_netlist_updater.cpp b/pcbnew/netlist_reader/board_netlist_updater.cpp index d2b4d43cbd..6ad30d1346 100644 --- a/pcbnew/netlist_reader/board_netlist_updater.cpp +++ b/pcbnew/netlist_reader/board_netlist_updater.cpp @@ -915,8 +915,8 @@ bool BOARD_NETLIST_UPDATER::UpdateNetlist( NETLIST& aNetlist ) if( m_isDryRun ) { - for( const auto& it : m_addedNets ) - delete it.second; + for( const std::pair& addedNet : m_addedNets ) + delete addedNet.second; m_addedNets.clear(); } @@ -928,13 +928,5 @@ bool BOARD_NETLIST_UPDATER::UpdateNetlist( NETLIST& aNetlist ) msg.Printf( _( "Total warnings: %d, errors: %d." ), m_warningCount, m_errorCount ); m_reporter->ReportTail( msg, RPT_SEVERITY_INFO ); - if( m_errorCount ) - { - m_reporter->ReportTail( _( "Errors occurred during the netlist update. Unless you fix them " - "your board will not be consistent with the schematics." ), - RPT_SEVERITY_ERROR ); - return false; - } - return true; }