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

bug fix a segfault when closing a second x11-window, then resizing the first

This commit is contained in:
rlar 2011-04-02 17:16:29 +00:00
parent 5059bcb624
commit 6268d236f0
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2011-04-02 Robert Larice
* src/frontend/plotting/x11.c :
extend the fix from 2011-02-11
for other ways of closing a plot window.
in response to
http://sourceforge.net/tracker/?func=detail&atid=423915&aid=3263437&group_id=38962
2011-03-24 Dietmar Warning
* xspice/icm/GNUmakefile.in: sun cc needs modified dependency flags (-xMD)

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

@ -320,11 +320,7 @@ static void handle_wm_messages(Widget w, XtPointer client_data, XEvent *event, B
&& event->xclient.message_type == atom_wm_protocols
&& (Atom) event->xclient.data.l[0] == atom_wm_delete_window) {
/* Iplots are done asynchronously */
DEVDEP(graph).isopen = 0;
/* MW. Not sure but DestroyGraph might free() to much - try Xt...() first */
XtDestroyWidget(DEVDEP(graph).shell);
DestroyGraph(graph->graphid);
RemoveWindow(graph);
}
}
@ -877,14 +873,7 @@ killwin(Widget w, caddr_t client_data, caddr_t call_data)
NG_IGNORE(call_data);
NG_IGNORE(w);
/* Iplots are done asynchronously */
DEVDEP(graph).isopen = 0;
/* MW. Not sure but DestroyGraph might free() to much - try Xt...() first */
XtDestroyWidget(DEVDEP(graph).shell);
if (graph == currentgraph)
currentgraph = FindGraph(graph->graphid - 1);
DestroyGraph(graph->graphid);
RemoveWindow(graph);
}
/* called from postcoms.c
@ -897,6 +886,8 @@ RemoveWindow(GRAPH *graph)
DEVDEP(graph).isopen = 0;
/* MW. Not sure but DestroyGraph might free() to much - try Xt...() first */
XtDestroyWidget(DEVDEP(graph).shell);
if (graph == currentgraph)
currentgraph = FindGraph(graph->graphid - 1);
DestroyGraph(graph->graphid);
}