From 4ff28fd39d8c3bdc9e130da2a67da6dd2bef71b2 Mon Sep 17 00:00:00 2001
From: stefan schippers <stefan.schippers@gmail.com>
Date: Wed, 8 Nov 2023 02:52:50 +0100
Subject: [PATCH] avoid calling simuldir in load_schematic when traversing
 hierarchy during netlisting

---
 src/save.c     | 4 ++--
 src/xschem.tcl | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/save.c b/src/save.c
index 8997e868..80b7ecf3 100644
--- a/src/save.c
+++ b/src/save.c
@@ -2660,7 +2660,7 @@ int save_schematic(const char *schname) /* 20171020 added return value */
   tclvareval(xctx->top_path, ".menubar.simulate configure -bg $simulate_bg", NULL);
   tclvareval("set tctx::", xctx->current_win_path, "_simulate $simulate_bg", NULL);
   tclvareval("catch {unset tctx::", xctx->current_win_path, "_simulate_id}", NULL);
-  tcleval("simuldir"); /* set local simulation directory if local_netlist_dir -s set*/
+  tcleval("simuldir"); /* set local simulation directory if local_netlist_dir is set*/
   return 1;
 }
 
@@ -2849,7 +2849,7 @@ void load_schematic(int load_symbols, const char *fname, int reset_undo, int ale
   }
   /* warning if two symbols perfectly overlapped */
   /* warning_overlapped_symbols(0); */ /* do this when netlisting */
-  tcleval("simuldir"); /* set local simulation directory if local_netlist_dir -s set*/
+  if(reset_undo) tcleval("simuldir"); /* set local simulation directory if local_netlist_dir is set*/
 }
 
 void clear_undo(void)
diff --git a/src/xschem.tcl b/src/xschem.tcl
index c66f2c32..05d55688 100644
--- a/src/xschem.tcl
+++ b/src/xschem.tcl
@@ -3798,7 +3798,7 @@ proc set_netlist_dir { change {dir {} }} {
 
   #### set local-to-schematic-dir if local_netlist_dir tcl var is set
   simuldir
-
+  # puts "-->$netlist_dir"
   #### change == 0
   if {$change == 0} {
     if {$netlist_dir ne {}} {