diff options
| author | Drew DeVault <sir@cmpwn.com> | 2018-07-19 14:09:19 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-19 14:09:19 -0700 |
| commit | 3483f1ea1ac66f261452f4cb4fea5f6b342b41d1 (patch) | |
| tree | a81ef9a4d873de4a886ee414872b496838a61160 /sway/main.c | |
| parent | 4154234eee1fa86f3a01d2f47b4fa632dcd73644 (diff) | |
| parent | da9c86c608b33d78e25ced5858be579f502efd63 (diff) | |
| download | sway-3483f1ea1ac66f261452f4cb4fea5f6b342b41d1.tar.xz | |
Merge branch 'master' into update-wlroots-1148
Diffstat (limited to 'sway/main.c')
| -rw-r--r-- | sway/main.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/sway/main.c b/sway/main.c index 1a55b519..a20f1dac 100644 --- a/sway/main.c +++ b/sway/main.c @@ -429,9 +429,16 @@ int main(int argc, char **argv) { security_sanity_check(); - config->active = true; setenv("WAYLAND_DISPLAY", server.socket, true); + if (!terminate_request) { + if (!server_start_backend(&server)) { + sway_terminate(EXIT_FAILURE); + } + } + + config->active = true; // Execute commands until there are none left + wlr_log(WLR_DEBUG, "Running deferred commands"); while (config->cmd_queue->length) { char *line = config->cmd_queue->items[0]; struct cmd_results *res = execute_command(line, NULL); |