From 2cfa79e52f8ff19bdcd800ab22e3c0d8de54d2cc Mon Sep 17 00:00:00 2001
From: unknown <xarx@sms.cz>
Date: Fri, 6 Nov 2015 09:22:46 +0100
Subject: [PATCH] Fix Bug #1513556 (missing components, when pspice specific
 fields Spice_Netlist_Enabled or Spice_Node_Sequence have no value.)

---
 .../netlist_exporter_pspice.cpp               | 57 +++++++++----------
 1 file changed, 28 insertions(+), 29 deletions(-)

diff --git a/eeschema/netlist_exporters/netlist_exporter_pspice.cpp b/eeschema/netlist_exporters/netlist_exporter_pspice.cpp
index bf6e021c8f..7158bd4d5e 100644
--- a/eeschema/netlist_exporters/netlist_exporter_pspice.cpp
+++ b/eeschema/netlist_exporters/netlist_exporter_pspice.cpp
@@ -185,9 +185,6 @@ bool NETLIST_EXPORTER_PSPICE::WriteNetlist( const wxString& aOutFileName, unsign
             {
                 wxString netlistEnabled = netlistEnabledField->GetText();
 
-                if( netlistEnabled.IsEmpty() )
-                    break;
-
                 if( netlistEnabled.CmpNoCase( disableStr ) == 0 )
                     continue;
             }
@@ -201,37 +198,39 @@ bool NETLIST_EXPORTER_PSPICE::WriteNetlist( const wxString& aOutFileName, unsign
                 wxString nodeSeqIndexLineStr = spiceSeqField->GetText();
 
                 // Verify Field Exists and is not empty:
-                if( nodeSeqIndexLineStr.IsEmpty() )
-                    break;
-
-                // Create an Array of Standard Pin Names from part definition:
-                stdPinNameArray.Clear();
-
-                for( unsigned ii = 0; ii < m_SortedComponentPinList.size(); ii++ )
+                if( !nodeSeqIndexLineStr.IsEmpty() )
                 {
-                    NETLIST_OBJECT* pin = m_SortedComponentPinList[ii];
 
-                    if( !pin )
-                        continue;
+                    // Create an Array of Standard Pin Names from part definition:
+                    stdPinNameArray.Clear();
 
-                    stdPinNameArray.Add( pin->GetPinNumText() );
-                }
-
-                // Get Alt Pin Name Array From User:
-                wxStringTokenizer tkz( nodeSeqIndexLineStr, delimeters );
-
-                while( tkz.HasMoreTokens() )
-                {
-                    wxString    pinIndex = tkz.GetNextToken();
-                    int         seq;
-
-                    // Find PinName In Standard List assign Standard List Index to Name:
-                    seq = stdPinNameArray.Index(pinIndex);
-
-                    if( seq != wxNOT_FOUND )
+                    for( unsigned ii = 0; ii < m_SortedComponentPinList.size(); ii++ )
                     {
-                        pinSequence.push_back( seq );
+                        NETLIST_OBJECT* pin = m_SortedComponentPinList[ii];
+
+                        if( !pin )
+                            continue;
+
+                        stdPinNameArray.Add( pin->GetPinNumText() );
                     }
+
+                    // Get Alt Pin Name Array From User:
+                    wxStringTokenizer tkz( nodeSeqIndexLineStr, delimeters );
+
+                    while( tkz.HasMoreTokens() )
+                    {
+                        wxString    pinIndex = tkz.GetNextToken();
+                        int         seq;
+
+                        // Find PinName In Standard List assign Standard List Index to Name:
+                        seq = stdPinNameArray.Index(pinIndex);
+
+                        if( seq != wxNOT_FOUND )
+                        {
+                            pinSequence.push_back( seq );
+                        }
+                    }
+
                 }
             }