additional X11 SAFERHANGUP changes
While messing around with window closure events, I found that some such events during startup were being ignored as a result a SAFERHANGUP changes.
This commit is contained in:
@@ -1187,6 +1187,7 @@ X11_hangup(w, event, params, num_params)
|
|||||||
Cardinal *num_params;
|
Cardinal *num_params;
|
||||||
{
|
{
|
||||||
hangup(1); /* 1 is commonly SIGHUP, but ignored anyway */
|
hangup(1); /* 1 is commonly SIGHUP, but ignored anyway */
|
||||||
|
exit_x_event = TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* askname ----------------------------------------------------------------- */
|
/* askname ----------------------------------------------------------------- */
|
||||||
|
|||||||
+4
-4
@@ -320,7 +320,7 @@ X11_player_selection()
|
|||||||
XtDestroyWidget(popup);
|
XtDestroyWidget(popup);
|
||||||
free((genericptr_t)choices), choices = 0;
|
free((genericptr_t)choices), choices = 0;
|
||||||
|
|
||||||
if (ps_selected == PS_QUIT) {
|
if (ps_selected == PS_QUIT || program_state.done_hup) {
|
||||||
clearlocks();
|
clearlocks();
|
||||||
X11_exit_nhwindows((char *)0);
|
X11_exit_nhwindows((char *)0);
|
||||||
terminate(0);
|
terminate(0);
|
||||||
@@ -385,7 +385,7 @@ X11_player_selection()
|
|||||||
XtDestroyWidget(popup);
|
XtDestroyWidget(popup);
|
||||||
free((genericptr_t)choices), choices = 0;
|
free((genericptr_t)choices), choices = 0;
|
||||||
|
|
||||||
if (ps_selected == PS_QUIT) {
|
if (ps_selected == PS_QUIT || program_state.done_hup) {
|
||||||
clearlocks();
|
clearlocks();
|
||||||
X11_exit_nhwindows((char *)0);
|
X11_exit_nhwindows((char *)0);
|
||||||
terminate(0);
|
terminate(0);
|
||||||
@@ -450,7 +450,7 @@ X11_player_selection()
|
|||||||
XtDestroyWidget(popup);
|
XtDestroyWidget(popup);
|
||||||
free((genericptr_t)choices), choices = 0;
|
free((genericptr_t)choices), choices = 0;
|
||||||
|
|
||||||
if (ps_selected == PS_QUIT) {
|
if (ps_selected == PS_QUIT || program_state.done_hup) {
|
||||||
clearlocks();
|
clearlocks();
|
||||||
X11_exit_nhwindows((char *)0);
|
X11_exit_nhwindows((char *)0);
|
||||||
terminate(0);
|
terminate(0);
|
||||||
@@ -514,7 +514,7 @@ X11_player_selection()
|
|||||||
XtDestroyWidget(popup);
|
XtDestroyWidget(popup);
|
||||||
free((genericptr_t)choices), choices = 0;
|
free((genericptr_t)choices), choices = 0;
|
||||||
|
|
||||||
if (ps_selected == PS_QUIT) {
|
if (ps_selected == PS_QUIT || program_state.done_hup) {
|
||||||
clearlocks();
|
clearlocks();
|
||||||
X11_exit_nhwindows((char *)0);
|
X11_exit_nhwindows((char *)0);
|
||||||
terminate(0);
|
terminate(0);
|
||||||
|
|||||||
Reference in New Issue
Block a user