From 4aa17534fb45dce8792bc3d40093b336c4fea51b Mon Sep 17 00:00:00 2001
From: rlar <rlar>
Date: Mon, 2 Jan 2012 13:04:14 +0000
Subject: [PATCH] xspice bug fix, invoke EVTsetup(ckt) only when `reset'

---
 ChangeLog                        | 8 ++++++++
 src/spicelib/analysis/cktdojob.c | 2 ++
 2 files changed, 10 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index dc60412ef..cd863e2d0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2012-01-02  Robert Larice
+ * src/spicelib/analysis/cktdojob.c :
+  xspice bug fix, invoke EVTsetup(ckt) only when `reset'
+
+   bug fix, tracker ID 3388916
+   Segfault when combining digital models and breakpoint control
+     https://sourceforge.net/tracker/?func=detail&aid=3388916&group_id=38962&atid=423915
+
 2012-01-02  Robert Larice
  * src/frontend/error.c :
   controlled_exit() shall not block waiting for a keyboard press
diff --git a/src/spicelib/analysis/cktdojob.c b/src/spicelib/analysis/cktdojob.c
index 1e3f13733..3d19dd534 100644
--- a/src/spicelib/analysis/cktdojob.c
+++ b/src/spicelib/analysis/cktdojob.c
@@ -196,6 +196,7 @@ CKTdoJob(CKTcircuit *ckt, int reset, TSKtask *task)
 		    error = CKTic(ckt);
 		if (!error){
 #ifdef XSPICE
+            if(reset) {
                   /* gtri - begin - 6/10/91 - wbk - Setup event-driven data */
                   error = EVTsetup(ckt);
                   if(error) {
@@ -204,6 +205,7 @@ CKTdoJob(CKTcircuit *ckt, int reset, TSKtask *task)
                     return(error);
                   }
                   /* gtri - end - 6/10/91 - wbk - Setup event-driven data */
+            }
 #endif
 		    error = analInfo[i]->an_func (ckt, reset);
 			/* txl, cpl addition */