aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDrew DeVault <sir@cmpwn.com>2019-02-05 16:50:55 +0100
committerGitHub <noreply@github.com>2019-02-05 16:50:55 +0100
commit09c2a46b3d28b447ec070f0d6a57bd47fe1e6fd7 (patch)
tree00dbf9a7f3a1c81ccc358fb7ef8e2d66fd872b3f
parent1fde9a9355fc398a3a3218b323138707cce1660f (diff)
parente1b8190d2cce524ee460e4e32ea254bc697d36e9 (diff)
Merge pull request #3582 from c-edw/FixUninitializedInputManager
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 b3ffdd83..67d0f799 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);