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

Fix Bug #624 - "Destroy All Fails with an Open Plot Window" for X11. 

Move XftDrawDestroy() call to a point where the window still exists.
This commit is contained in:
Giles Atkinson 2023-02-25 09:54:04 +00:00 committed by Holger Vogt
parent f83c89cce7
commit 2233e2f825
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/frontend/plotting/x11.c
View File

@ -1189,6 +1189,9 @@ void RemoveWindow(GRAPH *graph)
DEVDEP(graph).isopen = 0; DEVDEP(graph).isopen = 0;
/* MW. Not sure but DestroyGraph might free() too much - try Xt...() first */ /* MW. Not sure but DestroyGraph might free() too much - try Xt...() first */
XtUnmapWidget(DEVDEP(graph).shell); XtUnmapWidget(DEVDEP(graph).shell);
#ifdef HAVE_LIBXFT
XftDrawDestroy(DEVDEP(graph).draw);
#endif
XtDestroyWidget(DEVDEP(graph).shell); XtDestroyWidget(DEVDEP(graph).shell);
#ifndef HAVE_LIBXFT #ifndef HAVE_LIBXFT
XFreeFont(display, DEVDEP(graph).font); XFreeFont(display, DEVDEP(graph).font);
@ -1198,7 +1201,6 @@ void RemoveWindow(GRAPH *graph)
#ifdef HAVE_LIBXFT #ifdef HAVE_LIBXFT
XftFontClose( display, DEVDEP(graph).font0); XftFontClose( display, DEVDEP(graph).font0);
XftFontClose( display, DEVDEP(graph).font90); XftFontClose( display, DEVDEP(graph).font90);
XftDrawDestroy(DEVDEP(graph).draw);
XftColorFree(display, DefaultVisual(display, 0), DEVDEP(graph).cmap, &DEVDEP(graph).color); XftColorFree(display, DefaultVisual(display, 0), DEVDEP(graph).cmap, &DEVDEP(graph).color);
#endif #endif
} }