aboutsummaryrefslogtreecommitdiffstats
path: root/sway/main.c
diff options
context:
space:
mode:
authorLibravatar Luminarys <kizunanohikari@gmail.com>2015-08-17 17:15:05 -0500
committerLibravatar Luminarys <kizunanohikari@gmail.com>2015-08-17 17:15:05 -0500
commit7427ce89303a2f409ed651643bd8c6566217e7c5 (patch)
treee875eb57fa57be78e2a6660abd0a864117f96bb7 /sway/main.c
parentImprove default config (diff)
downloadsway-7427ce89303a2f409ed651643bd8c6566217e7c5.tar.gz
sway-7427ce89303a2f409ed651643bd8c6566217e7c5.tar.zst
sway-7427ce89303a2f409ed651643bd8c6566217e7c5.zip
Switched config loading order to prevent root access w/wlc
Diffstat (limited to 'sway/main.c')
-rw-r--r--sway/main.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sway/main.c b/sway/main.c
index 69224edc..aa8546e9 100644
--- a/sway/main.c
+++ b/sway/main.c
@@ -18,16 +18,16 @@ int main(int argc, char **argv) {
18 /* Signal handling */ 18 /* Signal handling */
19 signal(SIGCHLD, sigchld_handle); 19 signal(SIGCHLD, sigchld_handle);
20 20
21 if (!load_config()) {
22 sway_log(L_ERROR, "Errors loading config!");
23 }
24
25 setenv("WLC_DIM", "0", 0); 21 setenv("WLC_DIM", "0", 0);
26 if (!wlc_init(&interface, argc, argv)) { 22 if (!wlc_init(&interface, argc, argv)) {
27 return 1; 23 return 1;
28 } 24 }
29 setenv("DISPLAY", ":1", 1); 25 setenv("DISPLAY", ":1", 1);
30 26
27 if (!load_config()) {
28 sway_log(L_ERROR, "Error(s) loading config!");
29 }
30
31 wlc_run(); 31 wlc_run();
32 32
33 return 0; 33 return 0;