From 8822f8dce2571b523e93b916b486da7585083016 Mon Sep 17 00:00:00 2001
From: "R. Timothy Edwards" <tim@opencircuitdesign.com>
Date: Thu, 22 Jan 2026 11:55:36 -0500
Subject: [PATCH] Added additional code to make the last pull request merge
 work, which is to not force a setting for the command entry window when
 creating a new window if the option variable already exists.

---
 tcltk/wrapper.tcl | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/tcltk/wrapper.tcl b/tcltk/wrapper.tcl
index f4bf3879..29c1e97b 100644
--- a/tcltk/wrapper.tcl
+++ b/tcltk/wrapper.tcl
@@ -576,6 +576,7 @@ set Opts(toolbar) 0
 set Opts(toolscale) 1.0
 set Opts(drc) 1
 set Opts(autobuttontext) 1
+set Opts(cmdentry) 0
 
 # Update cell and tech managers in response to a cif or gds read command
 
@@ -1187,8 +1188,12 @@ proc magic::openwrapper {{cell ""} {framename ""}} {
    bind ${winname} <Motion> "*bypass setpoint %x %y ${winname}; \
 	magic::cursorview ${winname}"
 
-   set Winopts(${framename},toolbar) 1
-   set Winopts(${framename},cmdentry) 0
+   if {[catch {set Winopts(${framename},toolbar)}]} {
+      set Winopts(${framename},toolbar) 1
+   }
+   if {[catch {set Winopts(${framename},cmdentry)}]} {
+      set Winopts(${framename},cmdentry) $Opts(cmdentry)
+   }
 
 # #################################
 # File