luke
/
ngspice
mirror of https://git.code.sf.net/p/ngspice/ngspice
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

give preference to mc_reload when reloading the circuit

This commit is contained in:
Holger Vogt 2018-08-15 21:16:39 +02:00
parent bb86b137a7
commit cebb83eec1
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/frontend/inp.c
View File

@ -467,18 +467,19 @@ inp_spsource(FILE *fp, bool comfile, char *filename, bool intfile)
} }
/* called with *fp == NULL and not intfile: we want to reload circuit from mc_deck */ /* called with *fp == NULL and not intfile: we want to reload circuit from mc_deck */
else { else {
/* re-load input deck from the current circuit structure */
if (ft_curckt && ft_curckt->ci_mcdeck) {
deck = inp_deckcopy(ft_curckt->ci_mcdeck);
expr_w_temper = TRUE;
}
/* re-load deck due to command 'reset' via function inp_source_recent() */ /* re-load deck due to command 'reset' via function inp_source_recent() */
else if (mc_reload) { if (mc_reload) {
deck = inp_deckcopy(mc_deck); deck = inp_deckcopy(mc_deck);
expr_w_temper = TRUE; expr_w_temper = TRUE;
mc_reload = FALSE; mc_reload = FALSE;
fprintf(stdout, "Reset re-loads circuit %s\n", mc_deck->line); fprintf(stdout, "Reset re-loads circuit %s\n", mc_deck->line);
} }
/* re-load input deck from the current circuit structure */
else if (ft_curckt && ft_curckt->ci_mcdeck) {
deck = inp_deckcopy(ft_curckt->ci_mcdeck);
expr_w_temper = TRUE;
}
/* no circuit available, should not happen */ /* no circuit available, should not happen */
else { else {
fprintf(stderr, "Error: No circuit loaded, cannot copy internally using mc_source\n"); fprintf(stderr, "Error: No circuit loaded, cannot copy internally using mc_source\n");