diff options
author | Eric Engestrom <eric@engestrom.ch> | 2021-11-13 15:25:58 +0000 |
---|---|---|
committer | Kirill Primak <vyivel@posteo.net> | 2021-11-14 10:43:09 +0300 |
commit | bb7bb3676deead149c66fbf74b55d3bb4f9d69b5 (patch) | |
tree | a07d0f227cb4a8e80f0f65954c4789182dca716d | |
parent | Update URL to wlroots project (GitHub->GitLab) (diff) | |
download | sway-bb7bb3676deead149c66fbf74b55d3bb4f9d69b5.tar.gz sway-bb7bb3676deead149c66fbf74b55d3bb4f9d69b5.tar.zst sway-bb7bb3676deead149c66fbf74b55d3bb4f9d69b5.zip |
sway: allow IPCs on proprietary drivers
Proprietary drivers require --unsupported-gpu to be allowed, and IPCs
require no option to be passed.
The only way to satisfy both is to run IPCs before checking for
proprietary drivers.
-rw-r--r-- | sway/main.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sway/main.c b/sway/main.c index 2c760524..6c71048b 100644 --- a/sway/main.c +++ b/sway/main.c | |||
@@ -342,7 +342,6 @@ int main(int argc, char **argv) { | |||
342 | log_kernel(); | 342 | log_kernel(); |
343 | log_distro(); | 343 | log_distro(); |
344 | log_env(); | 344 | log_env(); |
345 | detect_proprietary(allow_unsupported_gpu); | ||
346 | 345 | ||
347 | if (optind < argc) { // Behave as IPC client | 346 | if (optind < argc) { // Behave as IPC client |
348 | if (optind != 1) { | 347 | if (optind != 1) { |
@@ -369,6 +368,8 @@ int main(int argc, char **argv) { | |||
369 | return 0; | 368 | return 0; |
370 | } | 369 | } |
371 | 370 | ||
371 | detect_proprietary(allow_unsupported_gpu); | ||
372 | |||
372 | if (!server_privileged_prepare(&server)) { | 373 | if (!server_privileged_prepare(&server)) { |
373 | return 1; | 374 | return 1; |
374 | } | 375 | } |