alex/swayfx
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #3582 from c-edw/FixUninitializedInputManager

Browse source 
Initialize server so input manager is available.
This commit is contained in:
Drew DeVault 2019-02-05 16:50:55 +01:00 committed by GitHub
parent 1fde9a9355 e1b8190d2c
commit 09c2a46b3d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
sway/main.c
View file

@ -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);