diff options
| author |  Mikkel Oscar Lyderik <mikkeloscar@gmail.com> | 2016-02-26 09:08:05 +0100 |
|---|---|---|
| committer | Mikkel Oscar Lyderik <mikkeloscar@gmail.com> | 2016-02-26 09:42:21 +0100 |
| commit | 5e253fdd9ac5c8733203eec9870aa0ca2cd238fd (patch) | |
| tree | 3bfaae22500ddfc326dfd4fa4b81bbab285a4c2f /swaygrab | |
| parent | Merge pull request #494 from gpyh/argsegfault (diff) | |
| download | sway-5e253fdd9ac5c8733203eec9870aa0ca2cd238fd.tar.gz sway-5e253fdd9ac5c8733203eec9870aa0ca2cd238fd.tar.zst sway-5e253fdd9ac5c8733203eec9870aa0ca2cd238fd.zip | |
Correctly exit sway on errors.
Calling `exit` in sway_terminate prevents sway from correctly shutting
down (freeing data, cleanly terminating the ipc server, etc.).
A better way is to exit straight away if the failure occurs before
`wlc_run` and use sway_abort as usual if it occur when wlc is running.
Diffstat (limited to 'swaygrab')
| -rw-r--r-- | swaygrab/main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/swaygrab/main.c b/swaygrab/main.c index 82d623e7..6ba8fb3e 100644 --- a/swaygrab/main.c +++ b/swaygrab/main.c | |||
| @@ -11,8 +11,8 @@ | |||
| 11 | #include "ipc-client.h" | 11 | #include "ipc-client.h" |
| 12 | #include "util.h" | 12 | #include "util.h" |
| 13 | 13 | ||
| 14 | void sway_terminate(void) { | 14 | void sway_terminate(int exit_code) { |
| 15 | exit(EXIT_FAILURE); | 15 | exit(exit_code); |
| 16 | } | 16 | } |
| 17 | 17 | ||
| 18 | void grab_and_apply_magick(const char *file, const char *output, | 18 | void grab_and_apply_magick(const char *file, const char *output, |