luke
/
xschem
mirror of https://github.com/StefanSchippers/xschem.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix save() function usage, in case user cancels save

This commit is contained in:
Stefan Frederik 2021-12-01 17:00:01 +01:00
parent f94d3b5c15
commit cb8ffce9cf
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/actions.c
View File

@ -362,7 +362,7 @@ void ask_new_file(void)
if(!has_x) return; if(!has_x) return;
if(xctx->modified) { if(xctx->modified) {
if(save(1)) return; /* user cancels save, so do nothing. */ if(save(1) == -1 ) return; /* user cancels save, so do nothing. */
} }
tcleval("load_file_dialog {Load Schematic} .sch.sym INITIALLOADDIR"); tcleval("load_file_dialog {Load Schematic} .sch.sym INITIALLOADDIR");
my_snprintf(fullname, S(fullname),"%s", tclresult()); my_snprintf(fullname, S(fullname),"%s", tclresult());

6
src/scheduler.c
View File

@ -414,7 +414,7 @@ int xschem(ClientData clientdata, Tcl_Interp *interp, int argc, const char * arg
cmd_found = 1; cmd_found = 1;
cancel=save(1); cancel=save(1);
if(!cancel){ if(cancel != -1){ /* -1 means user cancel save request */
char name[PATH_MAX]; char name[PATH_MAX];
struct stat buf; struct stat buf;
int i; int i;
@ -426,7 +426,7 @@ int xschem(ClientData clientdata, Tcl_Interp *interp, int argc, const char * arg
if(argc>=3 && !strcmp(argv[2],"SYMBOL")) { if(argc>=3 && !strcmp(argv[2],"SYMBOL")) {
xctx->netlist_type = CAD_SYMBOL_ATTRS; xctx->netlist_type = CAD_SYMBOL_ATTRS;
set_tcl_netlist_type(); set_tcl_netlist_type();
for(i=0;;i++) { for(i=0;;i++) { /* find a non-existent untitled[-n].sym */
if(i == 0) my_snprintf(name, S(name), "%s.sym", "untitled"); if(i == 0) my_snprintf(name, S(name), "%s.sym", "untitled");
else my_snprintf(name, S(name), "%s-%d.sym", "untitled", i); else my_snprintf(name, S(name), "%s-%d.sym", "untitled", i);
if(stat(name, &buf)) break; if(stat(name, &buf)) break;
@ -1424,7 +1424,7 @@ int xschem(ClientData clientdata, Tcl_Interp *interp, int argc, const char * arg
{ {
cmd_found = 1; cmd_found = 1;
if(argc==3) { if(argc==3) {
if(!has_x || !xctx->modified || !save(1) ) { /* save(1)==1 --> user cancel */ if(!has_x || !xctx->modified || save(1) != -1 ) { /* save(1)==-1 --> user cancel */
dbg(1, "scheduler(): load: filename=%s\n", argv[2]); dbg(1, "scheduler(): load: filename=%s\n", argv[2]);
clear_all_hilights(); clear_all_hilights();
xctx->currsch = 0; xctx->currsch = 0;