aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorConnor E <38229097+c-edw@users.noreply.github.com>2019-02-05 15:39:22 +0000
committerDrew DeVault <sir@cmpwn.com>2019-02-11 10:22:53 -0500
commitcc5139d52ace3bbfa8fd706fe408551c11766f4c (patch)
tree00dbf9a7f3a1c81ccc358fb7ef8e2d66fd872b3f
parent2112f0aa2fcdf278dd3dccecc1a8261d3c97b44b (diff)
downloadsway-cc5139d52ace3bbfa8fd706fe408551c11766f4c.zip
sway-cc5139d52ace3bbfa8fd706fe408551c11766f4c.tar.gz
sway-cc5139d52ace3bbfa8fd706fe408551c11766f4c.tar.bz2
Initialize server so input manager is available.
-rw-r--r--sway/main.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/sway/main.c b/sway/main.c
index b3ffdd8..67d0f79 100644
--- a/sway/main.c
+++ b/sway/main.c
@@ -318,12 +318,6 @@ int main(int argc, char **argv) {
detect_proprietary(allow_unsupported_gpu);
detect_raspi();
- if (validate) {
- bool valid = load_main_config(config_path, false, true);
- free(config_path);
- return valid ? 0 : 1;
- }
-
if (optind < argc) { // Behave as IPC client
if (optind != 1) {
sway_log(SWAY_ERROR, "Don't use options with the IPC client");
@@ -365,6 +359,12 @@ int main(int argc, char **argv) {
return 1;
}
+ if (validate) {
+ bool valid = load_main_config(config_path, false, true);
+ free(config_path);
+ return valid ? 0 : 1;
+ }
+
ipc_init(&server);
setenv("WAYLAND_DISPLAY", server.socket, true);