summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRay Strode <rstrode@fedoraproject.org>2009-11-05 22:50:07 +0000
committerRay Strode <rstrode@fedoraproject.org>2009-11-05 22:50:07 +0000
commitbaa5d16cbefb19e966d377bd46b66fba6cec968a (patch)
tree98b4ce32591b96f949f5f3374398b1da071d1c59
parent86e94045edbe771a7d6e99868fc7c2776ed003bb (diff)
-rw-r--r--metacity-dont-do-bad-stuff-on-sigterm.patch5
1 files changed, 3 insertions, 2 deletions
diff --git a/metacity-dont-do-bad-stuff-on-sigterm.patch b/metacity-dont-do-bad-stuff-on-sigterm.patch
index 5a21400..7402e6c 100644
--- a/metacity-dont-do-bad-stuff-on-sigterm.patch
+++ b/metacity-dont-do-bad-stuff-on-sigterm.patch
@@ -9,7 +9,7 @@ diff -up metacity-2.28.0/src/core/main.c.sigterm metacity-2.28.0/src/core/main.c
/**
* The exit code we'll return to our parent process when we eventually die.
-@@ -368,12 +369,24 @@ meta_finalize (void)
+@@ -368,12 +369,25 @@ meta_finalize (void)
meta_session_shutdown ();
}
@@ -21,7 +21,8 @@ diff -up metacity-2.28.0/src/core/main.c.sigterm metacity-2.28.0/src/core/main.c
- meta_finalize ();
+ if (sigterm_pipe_fds[1] >= 0)
+ {
-+ write (sigterm_pipe_fds[1], "", 1);
++ ssize_t bytes_written;
++ bytes_written = write (sigterm_pipe_fds[1], "", 1);
+ close (sigterm_pipe_fds[1]);
+ sigterm_pipe_fds[1] = -1;
+ }