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 /swaybar | |
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 'swaybar')
-rw-r--r-- | swaybar/main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/swaybar/main.c b/swaybar/main.c index 737ee647..c6bbc7a5 100644 --- a/swaybar/main.c +++ b/swaybar/main.c | |||
@@ -10,9 +10,9 @@ | |||
10 | /* global bar state */ | 10 | /* global bar state */ |
11 | struct bar swaybar; | 11 | struct bar swaybar; |
12 | 12 | ||
13 | void sway_terminate(void) { | 13 | void sway_terminate(int exit_code) { |
14 | bar_teardown(&swaybar); | 14 | bar_teardown(&swaybar); |
15 | exit(EXIT_FAILURE); | 15 | exit(exit_code); |
16 | } | 16 | } |
17 | 17 | ||
18 | void sig_handler(int signal) { | 18 | void sig_handler(int signal) { |