sway

commit 09c2a46b3d28b447ec070f0d6a57bd47fe1e6fd7
parent 1fde9a9355fc398a3a3218b323138707cce1660f
Author: Drew DeVault <sir@cmpwn.com>
Date:   Tue,  5 Feb 2019 16:50:55 +0100

Merge pull request #3582 from c-edw/FixUninitializedInputManager

Initialize server so input manager is available.
Diffstat:
M
sway/main.c
 | 
12
++++++------

1 file changed, 6 insertions(+), 6 deletions(-)
diff --git 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);