runcoms2.c: prevent crash after 'remcirc' if no circuit is loaded

This commit is contained in:
h_vogt 2014-01-29 21:21:16 +01:00
parent 3b4d8e8069
commit 0609d231c0
1 changed files with 10 additions and 7 deletions

View File

@ -200,14 +200,8 @@ com_remcirc(wordlist *wl)
struct variable *v, *next;
struct line *dd; /*in: the spice deck */
struct circ *p, *prev = NULL;
#ifdef SHARED_MODULE
/* This may happen only with shared ngspice during transient analysis,
if simulation is stopped with 'bg_halt'
and then circuit shall be removed prematurely. */
TRANan *job = (TRANan *) ft_curckt->ci_ckt->CKTcurJob;
if ((job->JOBtype == 4) && (job->TRANplot))
SPfrontEnd->OUTendPlot (job->TRANplot);
TRANan *job;
#endif
NG_IGNORE(wl);
@ -217,6 +211,15 @@ com_remcirc(wordlist *wl)
return;
}
#ifdef SHARED_MODULE
/* This may happen only with shared ngspice during transient analysis,
if simulation is stopped with 'bg_halt'
and then circuit shall be removed prematurely. */
job = (TRANan *) ft_curckt->ci_ckt->CKTcurJob;
if (job && (job->JOBtype == 4) && (job->TRANplot))
SPfrontEnd->OUTendPlot (job->TRANplot);
#endif
/* delete numparam data structure dicoS */
nupa_del_dicoS();