From 05ed906aea0f04d2e359ac5058390a71f3d116cb Mon Sep 17 00:00:00 2001
From: Jon Evans <jon@craftyjon.com>
Date: Thu, 28 Mar 2019 21:15:36 -0400
Subject: [PATCH] Restore ERC checks that were accidentally removed

---
 eeschema/dialogs/dialog_erc.cpp | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/eeschema/dialogs/dialog_erc.cpp b/eeschema/dialogs/dialog_erc.cpp
index 654ba44010..fb8338f9de 100644
--- a/eeschema/dialogs/dialog_erc.cpp
+++ b/eeschema/dialogs/dialog_erc.cpp
@@ -547,6 +547,8 @@ void DIALOG_ERC::TestErc( REPORTER& aReporter )
     objectsConnectedList->ResetConnectionsType();
 
     unsigned lastItemIdx = 0;
+    unsigned nextItemIdx = 0;
+    int MinConn    = NOC;
 
     /* Check that a pin appears in only one net.  This check is necessary
      * because multi-unit components that have shared pins can be wired to
@@ -573,6 +575,13 @@ void DIALOG_ERC::TestErc( REPORTER& aReporter )
 
         wxASSERT_MSG( lastNet <= net, wxT( "Netlist not correctly ordered" ) );
 
+        if( lastNet != net )
+        {
+            // New net found:
+            MinConn      = NOC;
+            nextItemIdx = itemIdx;
+        }
+
         switch( item->m_Type )
         {
         // These items do not create erc problems
@@ -615,9 +624,8 @@ void DIALOG_ERC::TestErc( REPORTER& aReporter )
                 }
             }
 
-            // TODO(JE) Remove this if new system is finished
             // Look for ERC problems between pins:
-            //TestOthersItems( objectsConnectedList.get(), itemIdx, nextItemIdx, &MinConn );
+            TestOthersItems( objectsConnectedList.get(), itemIdx, nextItemIdx, &MinConn );
             break;
         }
         default: