mirror of
https://github.com/NickHu/sway
synced 2024-12-26 21:58:30 +01:00
Merge pull request #3582 from c-edw/FixUninitializedInputManager
Initialize server so input manager is available.
This commit is contained in:
commit
09c2a46b3d
1 changed files with 6 additions and 6 deletions
12
sway/main.c
12
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);
|
||||
|
|
Loading…
Reference in a new issue